diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2013-01-02 21:52:57 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2013-01-02 21:52:57 +0100 |
| commit | 208770d7fddefb7ac46dd63387bc8ab4a2724edd (patch) | |
| tree | 4d9377436c29a2b272505f7d9039d7110a48054d /phpBB/includes/acp/acp_modules.php | |
| parent | 1ca63fb30215c6fb4e51fdffc43c29ad0b417b42 (diff) | |
| parent | 0483971f7786b10c3359dfbe4912501de0d6c7de (diff) | |
| download | forums-208770d7fddefb7ac46dd63387bc8ab4a2724edd.tar forums-208770d7fddefb7ac46dd63387bc8ab4a2724edd.tar.gz forums-208770d7fddefb7ac46dd63387bc8ab4a2724edd.tar.bz2 forums-208770d7fddefb7ac46dd63387bc8ab4a2724edd.tar.xz forums-208770d7fddefb7ac46dd63387bc8ab4a2724edd.zip | |
Merge remote-tracking branch 'p/ticket/11305' into develop
* p/ticket/11305:
[ticket/11305] Mock container for cache driver in functional create_user()
[ticket/11305] Check for $cache being null before using it in db drivers.
[ticket/11305] Define hook finder as a service on the container.
[ticket/11305] Adjust comment.
[ticket/11305] Use phpbb_create_default_container.
[ticket/11305] Create a normal container during final installation step.
[ticket/11305] Retrieve cache driver from container rather than cache service.
[ticket/11305] Extract hook finder from cache service.
Diffstat (limited to 'phpBB/includes/acp/acp_modules.php')
| -rw-r--r-- | phpBB/includes/acp/acp_modules.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index 8528dc91c4..52a82004e8 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -740,15 +740,15 @@ class acp_modules */ function remove_cache_file() { - global $cache; + global $phpbb_container; // Sanitise for future path use, it's escaped as appropriate for queries $p_class = str_replace(array('.', '/', '\\'), '', basename($this->module_class)); - $cache->destroy('_modules_' . $p_class); + $phpbb_container->get('cache.driver')->destroy('_modules_' . $p_class); // Additionally remove sql cache - $cache->destroy('sql', MODULES_TABLE); + $phpbb_container->get('cache.driver')->destroy('sql', MODULES_TABLE); } /** |