Merge branch 'master' into 0.7.x

diff --git a/lib/searchaction.php b/lib/searchaction.php
index e7ad4affdaab9eaac36e4fae6fe7c586443b9a1e..e74450e11f3e06dee57ce04754d81c7ac02a6bd6 100644 (file)
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -51,7 +51,7 @@ class SearchAction extends Action
      *
      * @return boolean true
      */
-    function isReadOnly()
+    function isReadOnly($args)
     {
         return true;
     }