MDL12672 fixed parent::search trouble; merged from MOODLE_19_STABLE

moodle · Dec 20, 2007 · 3cea9c5 · 3cea9c5
1 parent cb29abc
commit 3cea9c5
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/lib/adminlib.php b/lib/adminlib.php
@@ -1036,7 +1036,12 @@ function &locate($name, $findpath=false) {
     function search($query) {
         $result = array();
         foreach ($this->children as $child) {
-            $result = array_merge($result, $child->search($query));
+            $subsearch = $child->search($query);
+            if (!is_array($subsearch)) {
+                debugging('Incorrect search result from '.$child->name);
+                continue;
+            }
+            $result = array_merge($result, $subsearch);
         }
         return $result;
     }
@@ -3374,8 +3379,8 @@ function admin_page_managemods() {
     }
 
     function search($query) {
-        if (parent::search($query)) {
-            return true;
+        if ($result = parent::search($query)) {
+            return $result;
         }
 
         $found = false;
@@ -3415,8 +3420,8 @@ function admin_page_manageblocks() {
 
     function search($query) {
         global $CFG;
-        if (parent::search($query)) {
-            return true;
+        if ($result = parent::search($query)) {
+            return $result;
         }
 
         $found = false;