Commit e67fbc06 authored by IKEDA Soji's avatar IKEDA Soji
Browse files

Update version numbers.

parent 5cd831c1
......@@ -15217,7 +15217,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') {
......@@ -16860,7 +16860,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');
......
......@@ -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
......
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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' =>
......@@ -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' =>
......
......@@ -750,7 +750,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};
......@@ -767,7 +767,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};
......@@ -2680,7 +2680,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 {
......@@ -2813,7 +2813,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 {
......@@ -2873,7 +2873,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 {
......@@ -3093,7 +3093,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'};
}
......@@ -3160,7 +3160,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 {
......@@ -3199,7 +3199,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 {
......@@ -3385,7 +3385,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'};
}
......@@ -3777,7 +3777,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};
......@@ -3964,7 +3964,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'};
......@@ -4143,7 +4143,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'};
......@@ -4513,7 +4513,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};
......@@ -4546,7 +4546,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};
......
......@@ -1243,7 +1243,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' => {
......
......@@ -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
......@@ -2025,7 +2025,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.');
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment