moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-03 16:13:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-53170 search: API fixes for core subsystems

Browse source
This commit is contained in:
David Monllao 2016-04-26 15:10:54 +08:00
parent 1e72daa899
commit 1f69cd819f
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
search/classes/area/base.php
View file

@ -136,7 +136,14 @@ abstract class base {
* @return string * @return string
*/ */
public function get_visible_name($lazyload = false) { public function get_visible_name($lazyload = false) {
return get_string('search:' . $this->areaname, $this->componentname, null, $lazyload);
$component = $this->componentname;
// Core subsystem strings go to lang/XX/search.php.
if (strpos($component, 'core_') === 0) {
$component = 'search';
}
return get_string('search:' . $this->areaname, $component, null, $lazyload);
} }
/** /**
@ -150,8 +157,9 @@ abstract class base {
public function get_config_var_name() { public function get_config_var_name() {
if ($this->componenttype === 'core') { if ($this->componenttype === 'core') {
// Core subsystems config in search. // Core subsystems config in core_search and setting name using only [a-zA-Z0-9_]+.
return array('search', $this->areaid); $parts = \core_search\manager::extract_areaid_parts($this->areaid);
return array('core_search', $parts[0] . '_' . $parts[1]);
} }
// Plugins config in the plugin scope. // Plugins config in the plugin scope.

2
version.php
View file

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die(); defined('MOODLE_INTERNAL') || die();
$version = 2016050600.00; // YYYYMMDD = weekly release date of this DEV branch. $version = 2016050600.01; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches. // RR = release increments - 00 in DEV branches.
// .XX = incremental changes. // .XX = incremental changes.