[mms] Fix regression in copying a rule when storing in SQL backend (B…

…ug #13213).
horde · May 22, 2014 · 75e6c92 · 75e6c92
1 parent d62291b
commit 75e6c92
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/ingo/docs/CHANGES b/ingo/docs/CHANGES
@@ -2,6 +2,8 @@
 v3.2.0-git
 ----------
 
+[mms] Fix regression in copying a rule when storing in SQL backend (Bug
+      #13213).
 
 
 -----------

diff --git a/ingo/lib/Storage/Filters/Sql.php b/ingo/lib/Storage/Filters/Sql.php
@@ -239,7 +239,17 @@ public function copyRule($id)
             $newrule = $this->_filters[$id];
             $newrule['name'] = sprintf(_("Copy of %s"), $this->_filters[$id]['name']);
             $this->addRule($newrule, false);
-            $this->ruleUp(count($this->_filters) - 1, count($this->_filters) - $id - 2);
+
+            $rules = array();
+            foreach (array_slice($this->_filters, 0, -1) as $key => $val) {
+                $rules[$key] = $val;
+                if ($key == $id) {
+                    $end = end($this->_filters);
+                    $rules[key($this->_filters)] = current($this->_filters);
+                }
+            }
+
+            $this->sort($rules);
             return true;
         }
 

diff --git a/ingo/package.xml b/ingo/package.xml
@@ -33,7 +33,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/apache">ASL</license>
  <notes>
-* 
+* [mms] Fix regression in copying a rule when storing in SQL backend (Bug #13213).
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -1433,7 +1433,7 @@
    <date>2014-05-21</date>
    <license uri="http://www.horde.org/licenses/apache">ASL</license>
    <notes>
-* 
+* [mms] Fix regression in copying a rule when storing in SQL backend (Bug #13213).
    </notes>
   </release>
  </changelog>