Skip to content

Commit

Permalink
Update version numbers.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ikedas
ikedas committed Jan 19, 2019
1 parent aab8413 commit 8126821
Show file tree
Hide file tree
Showing 14 changed files with 29 additions and 29 deletions.
4 changes: 2 additions & 2 deletions src/cgi/wwsympa.fcgi.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15242,7 +15242,7 @@ sub do_search_user {
my @keys = qw(reception bounce topic);
@{$param->{'which'}{$l}}{@keys} = @{$list->{'user'}}{@keys};

# Compat. <= 6.2.38
# Compat. <= 6.2.40
$param->{'which'}{$l}{'included'} = 1
if defined $list->{'user'}{'inclusion'};
} elsif ($role eq 'owner') {
Expand Down Expand Up @@ -16885,7 +16885,7 @@ sub _prepare_subscriber {
$user->{'additional'} = join ',', @fields;
}

# Compat. <= 6.2.38
# Compat. <= 6.2.40
if (defined $user->{'inclusion'}) {
$user->{'included'} = 1;
$user->{'sources'} = $language->gettext('included');
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Sympa/DataSource.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ The other options set by new() may be accessed as attributes.
=head1 HISTORY
L<Sympa::DataSource> appeared on Sympa 6.2.39b.1.
L<Sympa::DataSource> appeared on Sympa 6.2.41b.
See also L<Sympa::Request::Handler::include/"HISTORY">.
=cut
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Sympa/DataSource/File.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,6 @@ L<Sympa::DataSource>.
=head1 HISTORY
L<Sympa::DataSource::File> appeared on Sympa 6.2.39b.1.
L<Sympa::DataSource::File> appeared on Sympa 6.2.41b.
=cut
2 changes: 1 addition & 1 deletion src/lib/Sympa/DataSource/LDAP.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,6 @@ L<Sympa::DataSource>.
=head1 HISTORY
L<Sympa::DataSource::LDAP> appeared on Sympa 6.2.39b.1.
L<Sympa::DataSource::LDAP> appeared on Sympa 6.2.41b.
=cut
2 changes: 1 addition & 1 deletion src/lib/Sympa/DataSource/LDAP2.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,6 @@ L<Sympa::DataSource>.
=head1 HISTORY
L<Sympa::DataSource::LDAP2> appeared on Sympa 6.2.39b.1.
L<Sympa::DataSource::LDAP2> appeared on Sympa 6.2.41b.
=cut
2 changes: 1 addition & 1 deletion src/lib/Sympa/DataSource/List.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,6 @@ L<Sympa::DataSource>.
=head1 HISTORY
L<Sympa::DataSource::List> appeared on Sympa 6.2.39b.1.
L<Sympa::DataSource::List> appeared on Sympa 6.2.41b.
=cut
2 changes: 1 addition & 1 deletion src/lib/Sympa/DataSource/RemoteDump.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,6 @@ L<Sympa::DataSource>.
=head1 HISTORY
L<Sympa::DataSource::RemoteDump> appeared on Sympa 6.2.39b.1.
L<Sympa::DataSource::RemoteDump> appeared on Sympa 6.2.41b.
=cut
2 changes: 1 addition & 1 deletion src/lib/Sympa/DataSource/RemoteFile.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,6 @@ L<Sympa::DataSource>.
=head1 HISTORY
L<Sympa::DataSource::RemoteFile> appeared on Sympa 6.2.39b.1.
L<Sympa::DataSource::RemoteFile> appeared on Sympa 6.2.41b.
=cut
2 changes: 1 addition & 1 deletion src/lib/Sympa/DataSource/SQL.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,6 @@ L<Sympa::DataSource>.
=head1 HISTORY
L<Sympa::DataSource::SQL> appeared on Sympa 6.2.39b.1.
L<Sympa::DataSource::SQL> appeared on Sympa 6.2.41b.
=cut
4 changes: 2 additions & 2 deletions src/lib/Sympa/DatabaseDescription.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ my %full_db_struct = (
'boolean set to 1 if subscriber comes from ADD or SUB',
'order' => 17,
},
# Obsoleted as of 6.2.39b.1. Use inclusion_subscriber.
# Obsoleted as of 6.2.41b. Use inclusion_subscriber.
#'included_subscriber' => {
# 'struct' => 'int(1)',
# 'doc' =>
Expand Down Expand Up @@ -968,7 +968,7 @@ my %full_db_struct = (
'set to 1 if user is list admin by definition in list config file',
'order' => 11,
},
# Obsoleted as of 6.2.39b.1. Use inclusion_admin.
# Obsoleted as of 6.2.41b. Use inclusion_admin.
#'included_admin' => {
# 'struct' => 'int(1)',
# 'doc' =>
Expand Down
28 changes: 14 additions & 14 deletions src/lib/Sympa/List.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@ sub dump_users {
}
}

# Compat.<=6.2.38
# Compat.<=6.2.40
# This is needed for earlier version of Sympa on e.g. remote host.
print $lock_fh "included 1\n"
if defined $user->{inclusion};
Expand All @@ -766,7 +766,7 @@ sub dump_users {
if defined $user->{$k} and length $user->{$k};
}

# Compat.<=6.2.38
# Compat.<=6.2.40
# This is needed for earlier version of Sympa on e.g. remote host.
print $lock_fh "included 1\n"
if defined $user->{inclusion};
Expand Down Expand Up @@ -2679,7 +2679,7 @@ sub get_list_member {
$user->{'custom_attribute'});
}

# Compat.<=6.2.38 FIXME: needed?
# Compat.<=6.2.40 FIXME: needed?
$user->{'included'} = 1
if defined $user->{'inclusion'};
} else {
Expand Down Expand Up @@ -2812,7 +2812,7 @@ sub get_first_list_member {
$user->{'custom_attribute'});
}

# Compat.<=6.2.38 FIXME: needed?
# Compat.<=6.2.40 FIXME: needed?
$user->{'included'} = 1
if defined $user->{'inclusion'};
} else {
Expand Down Expand Up @@ -2872,7 +2872,7 @@ sub get_next_list_member {
$user->{'custom_attribute'} = $custom_attr;
}

# Compat.<=6.2.38 FIXME: needed?
# Compat.<=6.2.40 FIXME: needed?
$user->{'included'} = 1
if defined $user->{'inclusion'};
} else {
Expand Down Expand Up @@ -3092,7 +3092,7 @@ sub get_current_admins {
$user->{'visibility'} ||= 'noconceal';
$user->{'update_date'} ||= $user->{'date'};

# Compat.<=6.2.38 FIXME: needed?
# Compat.<=6.2.40 FIXME: needed?
$user->{'included'} = 1
if defined $user->{'inclusion'};
}
Expand Down Expand Up @@ -3159,7 +3159,7 @@ sub get_first_bouncing_list_member {
$self->{'name'})
unless defined $user->{'email'} and length $user->{'email'};

# Compat.<=6.2.38 FIXME: needed?
# Compat.<=6.2.40 FIXME: needed?
$user->{'included'} = 1
if defined $user->{'inclusion'};
} else {
Expand Down Expand Up @@ -3198,7 +3198,7 @@ sub get_next_bouncing_list_member {
$user->{'custom_attribute'});
}

# Compat.<=6.2.38 FIXME: needed?
# Compat.<=6.2.40 FIXME: needed?
$user->{'included'} = 1
if defined $user->{'inclusion'};
} else {
Expand Down Expand Up @@ -3384,7 +3384,7 @@ sub get_members {
$user->{custom_attribute} = $custom_attr;
}

# Compat.<=6.2.38 FIXME: needed?
# Compat.<=6.2.40 FIXME: needed?
$user->{included} = 1
if defined $user->{'inclusion'};
}
Expand Down Expand Up @@ -3776,7 +3776,7 @@ sub update_list_admin {
# }
#}

# Compat.<=6.2.38 FIXME: is this used?
# Compat.<=6.2.40 FIXME: is this used?
$values->{inclusion} ||= ($values->{update_date} || time)
if $values->{included};

Expand Down Expand Up @@ -3958,7 +3958,7 @@ sub add_list_member {
$new_user->{'custom_attribute'}
);

# Compat.<=6.2.38 FIXME: needed?
# Compat.<=6.2.40 FIXME: needed?
$new_user->{'inclusion'} ||= ($new_user->{'date'} || time)
if $new_user->{'included'};

Expand Down Expand Up @@ -4137,7 +4137,7 @@ sub _add_list_admin {
$user->{'date'} ||= time;
$user->{'update_date'} ||= $user->{'date'};

# Compat.<=6.2.38 FIXME: needed?
# Compat.<=6.2.40 FIXME: needed?
$user->{'inclusion'} ||= $user->{'date'}
if $user->{'included'};

Expand Down Expand Up @@ -4501,7 +4501,7 @@ sub restore_users {
next unless $user->{email};

$user->{update_date} = $time;
# Compat. <= 6.2.38
# Compat. <= 6.2.40
# This is needed for dump by earlier version of Sympa.
$user->{inclusion} ||= ($user->{update_date} || time)
if $user->{included};
Expand Down Expand Up @@ -4534,7 +4534,7 @@ sub restore_users {
next unless defined $user->{email} and length $user->{email};

$user->{update_date} = $time;
# Compat. <= 6.2.38
# Compat. <= 6.2.40
# This is needed for dump by earlier version of Sympa.
$user->{inclusion} ||= ($user->{update_date} || time)
if $user->{included};
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Sympa/ListDef.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1225,7 +1225,7 @@ our %pinfo = (
'order' => 2,
'gettext_id' => "data location URL",
'format' => '.+',
'occurrence' => '0-1', # Backward compat. <= 6.2.38
'occurrence' => '0-1', # Backward compat. <= 6.2.40
'length' => 50
},
'user' => {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/Sympa/Request/Handler/include.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,6 @@ Inclusion of owners and moderators was introduced on Sympa 4.2b.5.
L<Datasource> module appeared on Sympa 5.3a.9.
Entirely rewritten and renamed L<Sympa::DataSource> module and
L<Sympa::Request::Hander::include> module appeared on Sympa 6.2.39b.1.
L<Sympa::Request::Hander::include> module appeared on Sympa 6.2.41b.
=cut
2 changes: 1 addition & 1 deletion src/lib/Sympa/Upgrade.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1902,7 +1902,7 @@ sub upgrade {

# included_* and include_sources_* were deprecated and inclusion_*
# was introduced in subscriber_table and admin_table.
if (lower_version($previous_version, '6.2.39b.1')) {
if (lower_version($previous_version, '6.2.41b.1')) {
my $sdm = Sympa::DatabaseManager->instance;

$log->syslog('notice', 'Upgrading subscriber_table and admin_table.');
Expand Down

0 comments on commit 8126821

Please sign in to comment.