L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-56057 search: Fix incorrectly reported no enabled search areas

Browse Source 
Also improved performance caching enabled search areas and
all search areas at the same time.
This commit is contained in:
David Monllao
2016-10-12 08:30:23 +08:00
parent d9520bc04e
commit b805d3f8ef
2 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/adminlib.php
+3 -9
View File
@@ -9699,19 +9699,13 @@ class admin_setting_searchsetupinfo extends admin_setting {
$return = '';
$brtag = html_writer::empty_tag('br');
// Available search areas.
$searchareas = \core_search\manager::get_search_areas_list();
$anyenabled = false;
$anyenabled = !empty(\core_search\manager::get_search_areas_list(true));
$anyindexed = false;
foreach ($searchareas as $areaid => $searcharea) {
list($componentname, $varname) = $searcharea->get_config_var_name();
if (!$anyenabled) {
$anyenabled = get_config($componentname, $varname . '_enabled');
}
if (!$anyindexed) {
$anyindexed = get_config($componentname, $varname . '_indexingstart');
}
if ($anyenabled && $anyindexed) {
if (get_config($componentname, $varname . '_indexingstart')) {
$anyindexed = true;
break;
}
}