From 08e3daac0e50df531e2e94918457d543b9038409 Mon Sep 17 00:00:00 2001
From: IKEDA Soji <ikeda@conversion.co.jp>
Date: Tue, 6 Nov 2018 16:41:23 +0900
Subject: [PATCH] *_include list parameter won't parse template if
 souorce_parameters was not defined. Fix for issue #461.

---
 src/lib/Sympa/List.pm | 38 +-------------------------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/src/lib/Sympa/List.pm b/src/lib/Sympa/List.pm
index f0f731ec0..aa677ba63 100644
--- a/src/lib/Sympa/List.pm
+++ b/src/lib/Sympa/List.pm
@@ -5778,8 +5778,6 @@ sub _load_list_members_from_include {
         }
 
         my $include_member;
-        ## the file has parameters
-        if (defined $entry->{'source_parameters'}) {
             my %parsing;
 
             $parsing{'data'}     = $entry->{'source_parameters'};
@@ -5800,11 +5798,6 @@ sub _load_list_members_from_include {
                 return undef;
             }
 
-        } else {
-            $include_member =
-                $self->_load_include_admin_user_file($include_file);
-        }
-
         if ($include_member and %$include_member) {
             foreach my $type (@sources_providing_listmembers) {
                 my $defs = $include_member->{$type};
@@ -6069,8 +6062,6 @@ sub _load_list_admin_from_include {
         }
 
         my $include_admin_user;
-        ## the file has parameters
-        if (defined $entry->{'source_parameters'}) {
             my %parsing;
 
             $parsing{'data'}     = $entry->{'source_parameters'};
@@ -6091,11 +6082,6 @@ sub _load_list_admin_from_include {
                 return undef;
             }
 
-        } else {
-            $include_admin_user =
-                $self->_load_include_admin_user_file($include_file);
-        }
-
         foreach my $type (@sources_providing_listmembers) {
             defined $total or last;
 
@@ -6267,9 +6253,7 @@ sub _load_include_admin_user_file {
     my %include;
     my (@paragraphs);
 
-    # the file has parmeters
-    if (defined $parsing) {
-        my @data = split(',', $parsing->{'data'});
+        my @data = split(',', $parsing->{'data'}) if defined $parsing->{'data'};
         my $vars = {'param' => \@data};
         my $output = '';
 
@@ -6291,26 +6275,6 @@ sub _load_include_admin_user_file {
                 push @{$paragraphs[$i]}, $line;
             }
         }
-    } else {
-        my $fh;
-        unless (open $fh, '<', $file) {
-            $log->syslog('info', 'Cannot open %s', $file);
-        }
-
-        ## Just in case...
-        local $RS = "\n";
-
-        ## Split in paragraphs
-        my $i = 0;
-        while (<$fh>) {
-            if (/^\s*$/) {
-                $i++ if $paragraphs[$i];
-            } else {
-                push @{$paragraphs[$i]}, $_;
-            }
-        }
-        close $fh;
-    }
 
     for my $index (0 .. $#paragraphs) {
         my @paragraph = @{$paragraphs[$index]};