Unverified Commit d7ee0629 authored by IKEDA Soji's avatar IKEDA Soji Committed by GitHub
Browse files

Merge pull request #764 from ikedas/issue-763 by ikedas

Fixes related to #693
parents 5642d464 d3dc27e8
...@@ -10633,7 +10633,7 @@ sub do_edit_list { ...@@ -10633,7 +10633,7 @@ sub do_edit_list {
   
# Call sync_include_admin if there are changes about owners or editors. # Call sync_include_admin if there are changes about owners or editors.
#FIXME:Update only when owner or editor was updated. #FIXME:Update only when owner or editor was updated.
unless ($list->sync_include_admin()) { unless (defined $list->sync_include_admin) {
Sympa::WWW::Report::reject_report_web('intern', Sympa::WWW::Report::reject_report_web('intern',
'sync_include_admin_failed', {}, $param->{'action'}, $list, 'sync_include_admin_failed', {}, $param->{'action'}, $list,
$param->{'user'}{'email'}, $robot); $param->{'user'}{'email'}, $robot);
......
...@@ -55,7 +55,7 @@ sub _next { ...@@ -55,7 +55,7 @@ sub _next {
my $ifh = $self->__dsh; my $ifh = $self->__dsh;
while (my $line = <$ifh>) { while (my $line = <$ifh>) {
chomp $line; $line =~ s/\s+\z//; # allow any styles of newline
if (++$lines > 49 and not $found) { if (++$lines > 49 and not $found) {
$log->syslog( $log->syslog(
......
...@@ -108,9 +108,6 @@ sub _open { ...@@ -108,9 +108,6 @@ sub _open {
$log->syslog('err', 'Cannot open file %s: %m', $self->{_tmpfile}); $log->syslog('err', 'Cannot open file %s: %m', $self->{_tmpfile});
return undef; return undef;
} }
while (my $line = <$fh>) {
last if $line =~ /\A\r?\n\z/;
}
return $fh; return $fh;
} }
......
...@@ -48,7 +48,7 @@ sub _open { ...@@ -48,7 +48,7 @@ sub _open {
my $fh = Sympa::Process::eval_in_time( my $fh = Sympa::Process::eval_in_time(
sub { sub {
my $sth = $self->{_db}->do_prepared_query($self->{sql_query}); my $sth = $db->do_prepared_query($self->{sql_query});
unless ($sth) { unless ($sth) {
$log->syslog('err', $log->syslog('err',
'Unable to connect to SQL data source %s', $self); 'Unable to connect to SQL data source %s', $self);
......
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