mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-60600_master' of https://github.com/marxjohnson/moodle

Browse Source
This commit is contained in:
David Monllao 2017-10-26 18:33:49 +02:00
commit a272c25649
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/classes/output/icon_system.php
View File

@ -145,5 +145,12 @@ abstract class icon_system {
}
return false;
}
/**
* Clears the instance cache, for use in unit tests
*/
public static function reset_caches() {
self::$instance = null;
}
}

1
lib/phpunit/classes/util.php
View File

@ -217,6 +217,7 @@ class phpunit_util extends testing_util {
core_filetypes::reset_caches();
\core_search\manager::clear_static();
core_user::reset_caches();
\core\output\icon_system::reset_caches();
if (class_exists('core_media_manager', false)) {
core_media_manager::reset_caches();
}