Merge branch 'master' into horde_5_2

horde · Nov 10, 2013 · 6057684 · 6057684
2 parents 87bd34f + 141ce74
commit 6057684
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Mock.php b/framework/ActiveSync/lib/Horde/ActiveSync/Driver/Mock.php
@@ -80,7 +80,7 @@ public function deleteFolder($id, $parent = Horde_ActiveSync::FOLDER_ROOT) {  }
      *                             here now to save an extra DB lookup for data
      *                             we already have.)
      */
-    public function changeFolder($id, $displayname, $parent, $uid = null)
+    public function changeFolder($id, $displayname, $parent, $uid = null, $type = null)
     {
         return $uid;
     }