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

MDL-69109 theme: try to load icons from the current theme

Browse Source
This commit is contained in:
Marina Glancy
2020-06-30 10:13:45 +02:00
parent 704153c454
commit d690ed3dd3
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/classes/output/icon_system.php
+9 -9
View File
@@ -72,22 +72,22 @@ abstract class icon_system {
/**
* Factory method
*
* @param $type Either a specific type, or null to get the default type.
* @param string $type Either a specific type, or null to get the default type.
* @return \core\output\icon_system
*/
public final static function instance($type = null) {
global $PAGE;
if ($type == null) {
if (!empty(self::$instance)) {
return self::$instance;
}
$type = $PAGE->theme->get_icon_system();
self::$instance = new $type();
// Default one is a singleton.
if (empty(self::$instance)) {
$icontype = $PAGE->theme->get_icon_system();
self::$instance = new $icontype();
}
// If $type is specified we need to make sure that the theme icon system supports this type,
// if not, we will return a generic new instance of the $type.
if ($type === null || is_a(self::$instance, $type)) {
return self::$instance;
} else {
// Not a singleton.
return new $type();
}
}