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

Fixes related to #693

src/cgi/wwsympa.fcgi.in

@@ -10633,7 +10633,7 @@ sub do_edit_list {
     # Call sync_include_admin if there are changes about owners or editors.
     #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',
             'sync_include_admin_failed', {}, $param->{'action'}, $list,
             $param->{'user'}{'email'}, $robot);

src/lib/Sympa/DataSource/File.pm

@@ -55,7 +55,7 @@ sub _next {
 
     my $ifh = $self->__dsh;
     while (my $line = <$ifh>) {
-        chomp $line;
+        $line =~ s/\s+\z//;    # allow any styles of newline
 
         if (++$lines > 49 and not $found) {
             $log->syslog(

src/lib/Sympa/DataSource/RemoteFile.pm

@@ -108,9 +108,6 @@ sub _open {
         $log->syslog('err', 'Cannot open file %s: %m', $self->{_tmpfile});
         return undef;
     }
-    while (my $line = <$fh>) {
-        last if $line =~ /\A\r?\n\z/;
-    }
     return $fh;
 }
 

src/lib/Sympa/DataSource/SQL.pm

@@ -48,7 +48,7 @@ sub _open {
 
     my $fh = Sympa::Process::eval_in_time(
         sub {
-            my $sth = $self->{_db}->do_prepared_query($self->{sql_query});
+            my $sth = $db->do_prepared_query($self->{sql_query});
             unless ($sth) {
                 $log->syslog('err',
                     'Unable to connect to SQL data source %s', $self);