MDL-8906 - Additional fix to prevent needless searching on blank query, merged from...

diff --git a/admin/search.php b/admin/search.php
index c68ef13801e4ef57903b0a52588c975d7b78a0b0..98405018f2a13a3a159208deaea35418939f4135 100644 (file)
--- a/admin/search.php
+++ b/admin/search.php
@@ -112,6 +112,11 @@ function search_settings(&$node, $query) {
 function search_settings_html(&$node, $query) {
 
     global $CFG;
+
+    if ($query == ''){
+        return '';
+    }
+
     if (is_a($node, 'admin_category')) {
         $entries = array_keys($node->children);
         $return = '';