diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-10-20 22:44:47 -0500 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-10-20 22:44:47 -0500 |
| commit | 75c5d6085b86de4c6ebc6c5bdf60898aac5c8e6f (patch) | |
| tree | de305639c260020b8c1ced47a23e6700f9ba3bb1 | |
| parent | a16f18541367e13949bf8c5f2117f4f5adcf5b33 (diff) | |
| parent | 99eeb52b763fb2efb2e5dad2b39c06b2be8c74b5 (diff) | |
| download | forums-75c5d6085b86de4c6ebc6c5bdf60898aac5c8e6f.tar forums-75c5d6085b86de4c6ebc6c5bdf60898aac5c8e6f.tar.gz forums-75c5d6085b86de4c6ebc6c5bdf60898aac5c8e6f.tar.bz2 forums-75c5d6085b86de4c6ebc6c5bdf60898aac5c8e6f.tar.xz forums-75c5d6085b86de4c6ebc6c5bdf60898aac5c8e6f.zip | |
Merge branch 'develop-ascraeus' into develop
| -rw-r--r-- | phpBB/common.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/common.php b/phpBB/common.php index f6586c40fe..0782bd7321 100644 --- a/phpBB/common.php +++ b/phpBB/common.php @@ -104,7 +104,7 @@ require($phpbb_root_path . 'includes/compatibility_globals.' . $phpEx); // Add own hook handler require($phpbb_root_path . 'includes/hooks/index.' . $phpEx); -$phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('\phpbb\template\template', 'display'))); +$phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler', 'append_sid', array('template', 'display'))); $phpbb_hook_finder = $phpbb_container->get('hook_finder'); foreach ($phpbb_hook_finder->find() as $hook) |