Permalink
Browse files

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

  • Loading branch information...
dmonllao committed Oct 26, 2017
2 parents 7ec04e0 + a9ca3fa commit a272c256495e69ae4c092b3ec577e80dbeaa52dc
Showing with 8 additions and 0 deletions.
  1. +7 −0 lib/classes/output/icon_system.php
  2. +1 −0 lib/phpunit/classes/util.php
@@ -145,5 +145,12 @@ public function get_icon_name_map() {
}
return false;
}
/**
* Clears the instance cache, for use in unit tests
*/
public static function reset_caches() {
self::$instance = null;
}
}
@@ -217,6 +217,7 @@ public static function reset_all_data($detectchanges = false) {
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();
}

0 comments on commit a272c25

Please sign in to comment.