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

MDL-59112 theme_clean: Always return expected moodle_url

Browse Source 
The function was returned some times a moodle_url object and another
times just a string with a relative URL.
This commit is contained in:
Juan Leyva
2017-06-08 09:40:47 +01:00
parent 46280f7478
commit 70dcc1e39a
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
theme/clean/classes/core_renderer.php
+14 -2
View File
@@ -130,8 +130,14 @@ class theme_clean_core_renderer extends theme_bootstrapbase_core_renderer {
* @return moodle_url|false
*/
public function get_logo_url($maxwidth = null, $maxheight = 100) {
global $CFG;
if (!empty($this->page->theme->settings->logo)) {
return $this->page->theme->setting_file_url('logo', 'logo');
$url = $this->page->theme->setting_file_url('logo', 'logo');
// Get a URL suitable for moodle_url.
$relativebaseurl = preg_replace('|^https?://|i', '//', $CFG->wwwroot);
$url = str_replace($relativebaseurl, '', $url);
return new moodle_url($url);
}
return parent::get_logo_url($maxwidth, $maxheight);
}
@@ -146,8 +152,14 @@ class theme_clean_core_renderer extends theme_bootstrapbase_core_renderer {
* @return moodle_url|false
*/
public function get_compact_logo_url($maxwidth = 100, $maxheight = 100) {
global $CFG;
if (!empty($this->page->theme->settings->smalllogo)) {
return $this->page->theme->setting_file_url('smalllogo', 'smalllogo');
$url = $this->page->theme->setting_file_url('smalllogo', 'smalllogo');
// Get a URL suitable for moodle_url.
$relativebaseurl = preg_replace('|^https?://|i', '//', $CFG->wwwroot);
$url = str_replace($relativebaseurl, '', $url);
return new moodle_url($url);
}
return parent::get_compact_logo_url($maxwidth, $maxheight);
}