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/cache | |
| 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/cache')
| -rw-r--r-- | phpBB/includes/cache/service.php | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/phpBB/includes/cache/service.php b/phpBB/includes/cache/service.php index 8c1e1ea1f8..69c5e0fdd0 100644 --- a/phpBB/includes/cache/service.php +++ b/phpBB/includes/cache/service.php @@ -403,34 +403,4 @@ class phpbb_cache_service return $usernames; } - - /** - * Obtain hooks... - */ - function obtain_hooks() - { - if (($hook_files = $this->driver->get('_hooks')) === false) - { - $hook_files = array(); - - // Now search for hooks... - $dh = @opendir($this->phpbb_root_path . 'includes/hooks/'); - - if ($dh) - { - while (($file = readdir($dh)) !== false) - { - if (strpos($file, 'hook_') === 0 && substr($file, -(strlen($this->php_ext) + 1)) === '.' . $this->php_ext) - { - $hook_files[] = substr($file, 0, -(strlen($this->php_ext) + 1)); - } - } - closedir($dh); - } - - $this->driver->put('_hooks', $hook_files); - } - - return $hook_files; - } } |