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

2017-10-26 18:33:49 +02:00
parent 7ec04e0e09 a9ca3fa167
commit a272c25649
2 changed files with 8 additions and 0 deletions
@@ -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();
        }