diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-01 20:48:04 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2013-01-02 01:29:32 -0500 |
| commit | 7adae349a96d5dffbd47ea5eca1e6bee481b7ce1 (patch) | |
| tree | 65ce33fe45dbbe33bd9e8cf344d712c91a6f8860 /phpBB/install | |
| parent | 1ca63fb30215c6fb4e51fdffc43c29ad0b417b42 (diff) | |
| download | forums-7adae349a96d5dffbd47ea5eca1e6bee481b7ce1.tar forums-7adae349a96d5dffbd47ea5eca1e6bee481b7ce1.tar.gz forums-7adae349a96d5dffbd47ea5eca1e6bee481b7ce1.tar.bz2 forums-7adae349a96d5dffbd47ea5eca1e6bee481b7ce1.tar.xz forums-7adae349a96d5dffbd47ea5eca1e6bee481b7ce1.zip | |
[ticket/11305] Extract hook finder from cache service.
Unlike most other things in cache service, hook finder does not need
a database connection.
PHPBB3-11305
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/database_update.php | 3 | ||||
| -rw-r--r-- | phpBB/install/index.php | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 87b1188c65..aeb5ae3859 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -133,7 +133,8 @@ if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx)) require($phpbb_root_path . 'includes/hooks/index.' . $phpEx); $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display'))); - foreach ($cache->obtain_hooks() as $hook) + $phpbb_hook_finder = new phpbb_hook_finder($phpbb_root_path, $phpEx, $phpbb_container->get('cache.driver')); + foreach ($phpbb_hook_finder->find() as $hook) { @include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx); } diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 8514f34e09..0b3af3bdce 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -199,7 +199,8 @@ if (file_exists($phpbb_root_path . 'includes/hooks/index.' . $phpEx)) require($phpbb_root_path . 'includes/hooks/index.' . $phpEx); $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display'))); - foreach ($cache->obtain_hooks() as $hook) + $phpbb_hook_finder = new phpbb_hook_finder($phpbb_root_path, $phpEx, $phpbb_container->get('cache.driver')); + foreach ($phpbb_hook_finder->find() as $hook) { @include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx); } |