Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
integration
prechecker
Commits
a272c256
Commit
a272c256
authored
Oct 26, 2017
by
David Monllaó
Browse files
Merge branch 'MDL-60600_master' of
https://github.com/marxjohnson/moodle
parents
7ec04e0e
a9ca3fa1
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/classes/output/icon_system.php
View file @
a272c256
...
...
@@ -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
;
}
}
lib/phpunit/classes/util.php
View file @
a272c256
...
...
@@ -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
();
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment