[mms] Fix procmail reject recipe (Bug #13060; admin@dei.unipd.it).

Conflicts: ingo/docs/CHANGES ingo/package.xml
horde · Mar 20, 2014 · ba854bc · ba854bc
1 parent 27d06fc
commit ba854bc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/ingo/docs/CHANGES b/ingo/docs/CHANGES
@@ -14,6 +14,13 @@ v3.2.0-git
 [mms] Add 'newEmailFilter' API link.
 
 
+------
+v3.1.5
+------
+
+[mms] Fix procmail reject recipe (Bug #13060; admin@dei.unipd.it).
+
+
 ------
 v3.1.4
 ------

diff --git a/ingo/lib/Script/Procmail/Recipe.php b/ingo/lib/Script/Procmail/Recipe.php
@@ -126,7 +126,6 @@ public function __construct($params = array(), $scriptparams = array())
             $this->_action[] = '  :0 Wh';
             $this->_action[] = '  * !^FROM_DAEMON';
             $this->_action[] = '  * !^X-Loop: $SENDER';
-            $this->_action[] = '  :0 eh';
             $this->_action[] = '  | (formail -rA"X-Loop: $SENDER" \\';
             $reason = $params['action-value'];
             if (Horde_Mime::is8bit($reason)) {

diff --git a/ingo/package.xml b/ingo/package.xml
@@ -1377,5 +1377,18 @@
 * [mms] Fix sieve driver correctly identifying mailing lists when determining whether to send vacation messages (skhorde@smail.inf.fg-bonn-rhein-sieg.de, Bug #12938).
    </notes>
   </release>
+  <release>
+   <version>
+    <release>3.1.5</release>
+    <api>3.0.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2014-03-10</date>
+   <license uri="http://www.horde.org/licenses/apache">ASL</license>
+   <notes>
+* [mms] Fix procmail reject recipe (Bug #13060; admin@dei.unipd.it).
+   </notes>
+  </release>
  </changelog>
 </package>