Fix maildrop rules without conditions (almarin@um.es, Bug #8103).

diff --git a/ingo/docs/CHANGES b/ingo/docs/CHANGES
index c416445..1375587 100644 (file)
--- a/ingo/docs/CHANGES
+++ b/ingo/docs/CHANGES
@@ -9,6 +9,7 @@ v2.0-git
 v1.2.2-cvs
 ----------
 
+[jan] Fix maildrop rules without conditions (almarin@um.es, Bug #8103).
 [cjh] Fix checks for the forward_file and forward_script procmail parameters
       in the VFS driver (Bug #7811).
 [cjh] Add %d (domain) as a replaceable variable in the vfs_path parameter

diff --git a/ingo/lib/Script/maildrop.php b/ingo/lib/Script/maildrop.php
index ac2e84b..c72ecbc 100644 (file)
--- a/ingo/lib/Script/maildrop.php
+++ b/ingo/lib/Script/maildrop.php
@@ -664,18 +664,19 @@ class Maildrop_Recipe {
             return '';
         }
 
-        $text[] = "if( \\";
+        if (count($this->_conditions) > 0) {
+
+            $text[] = "if( \\";
 
-        if (count($this->_conditions > 1)) {
             $nest = false;
             foreach ($this->_conditions as $condition) {
                 $cond = $nest ? $this->_combine : '   ';
                 $text[] = $cond . $condition['condition'] . $condition['flags'] . $condition['extra'] . " \\";
                 $nest = true;
             }
-        }
 
-        $text[] = ')';
+            $text[] = ')';
+        }
 
         foreach ($this->_action as $val) {
             $text[] = $val;