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

MDL-70486 output: Improve check for block region name string existence

Browse Source 
* The fact that non-existing strings are returned in certain format
  starting with the bracket, is kind of side debugging effect. The value
  is really undefined and should not be relied upon.
* The string could actually exist and be worded so that its first
  character is also the square bracket.
This commit is contained in:
David Mudrák
2020-12-17 10:03:42 +01:00
parent d328ef1c9d
commit 34ae2bfdf4
2 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/outputlib.php
+10 -10
View File
@@ -2451,22 +2451,22 @@ class theme_config {
* @return string
*/
protected function get_region_name($region, $theme) {
$regionstring = get_string('region-' . $region, 'theme_' . $theme);
// A name exists in this theme, so use it
if (substr($regionstring, 0, 1) != '[') {
return $regionstring;
$stringman = get_string_manager();
// Check if the name is defined in the theme.
if ($stringman->string_exists('region-' . $region, 'theme_' . $theme)) {
return get_string('region-' . $region, 'theme_' . $theme);
}
// Otherwise, try to find one elsewhere
// Check parents, if any
// Check the theme parents.
foreach ($this->parents as $parentthemename) {
$regionstring = get_string('region-' . $region, 'theme_' . $parentthemename);
if (substr($regionstring, 0, 1) != '[') {
return $regionstring;
if ($stringman->string_exists('region-' . $region, 'theme_' . $parentthemename)) {
return get_string('region-' . $region, 'theme_' . $parentthemename);
}
}
// Last resort, try the boost theme for names
// Last resort, try the boost theme for names.
return get_string('region-' . $region, 'theme_boost');
}