[jan] Fix Sieve error if days of vacation is unset (Bug #13890).

Conflicts: ingo/docs/CHANGES ingo/package.xml
horde · Mar 2, 2015 · e57d845 · e57d845
1 parent 521998e
commit e57d845
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/ingo/docs/CHANGES b/ingo/docs/CHANGES
@@ -12,6 +12,8 @@ v3.3.0-git
 v3.2.4
 ------
 
+[mms] Rate-limit filters drag/drop changes to prevent race conditions (Bug
+      #13819).
 [mms] Fix filter drag/drop ordering working in basic view (Bug #13820).
 [mms] Maildir requires UTF7-IMAP encoding for folder names (Bug #13378).
 

diff --git a/ingo/lib/Script/Sieve/Action/Vacation.php b/ingo/lib/Script/Sieve/Action/Vacation.php
@@ -166,7 +166,10 @@ public function requires()
      */
     protected function _vacationCode()
     {
-        $code = 'vacation :days ' . $this->_vars['days'] . ' ';
+        $code = 'vacation ';
+        if (!empty($this->_vars['days'])) {
+            $code .= ':days ' . $this->_vars['days'] . ' ';
+        }
         $addresses = $this->_vars['addresses'];
         $stringlist = '';
         if (count($addresses) > 1) {

diff --git a/ingo/package.xml b/ingo/package.xml
@@ -1567,13 +1567,27 @@
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
-   <date>2014-12-03</date>
+   <date>2015-02-10</date>
    <license uri="http://www.horde.org/licenses/apache">ASL</license>
    <notes>
+* [mms] Rate-limit filters drag/drop changes to prevent race conditions (Bug #13819).
 * [mms] Fix filter drag/drop ordering working in basic view (Bug #13820).
 * [mms] Maildir requires UTF7-IMAP encoding for folder names (Bug #13378).
    </notes>
   </release>
+  <release>
+   <version>
+    <release>3.2.5</release>
+    <api>3.2.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2015-02-10</date>
+   <license uri="http://www.horde.org/licenses/apache">ASL</license>
+   <notes>
+* [jan] Fix Sieve error if days of vacation is unset (Bug #13890).
+   </notes>
+  </release>
   <release>
    <date>2015-02-25</date>
    <version>