mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 16:32:18 +02:00
Code Issues Projects Releases Wiki Activity

MDL12672 fixed parent::search trouble; merged from MOODLE_19_STABLE

Browse Source
This commit is contained in:
skodak 2007-12-20 14:39:12 +00:00
parent cb29abc508
commit 3cea9c554a
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/adminlib.php
View File

@ -1036,7 +1036,12 @@ class admin_category extends parentable_part_of_admin_tree {
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 @@ class admin_page_managemods extends admin_externalpage {
}
function search($query) {
if (parent::search($query)) {
return true;
if ($result = parent::search($query)) {
return $result;
}
$found = false;
@ -3415,8 +3420,8 @@ class admin_page_manageblocks extends admin_externalpage {
function search($query) {
global $CFG;
if (parent::search($query)) {
return true;
if ($result = parent::search($query)) {
return $result;
}
$found = false;