aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-09-23 11:10:17 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-09-23 11:10:17 +0000
commit6e2d395da9fd3f2d641e368eea40322df7159955 (patch)
treeb3b2e6809b7b4fa591de2e93bc7c3476e163edcc /phpBB
parentee9263b0ba8d1d368099edc1c80a3fa58c5e8acb (diff)
downloadforums-6e2d395da9fd3f2d641e368eea40322df7159955.tar
forums-6e2d395da9fd3f2d641e368eea40322df7159955.tar.gz
forums-6e2d395da9fd3f2d641e368eea40322df7159955.tar.bz2
forums-6e2d395da9fd3f2d641e368eea40322df7159955.tar.xz
forums-6e2d395da9fd3f2d641e368eea40322df7159955.zip
cope with updates too
git-svn-id: file:///svn/phpbb/trunk@8103 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rwxr-xr-xphpBB/install/index.php17
1 files changed, 12 insertions, 5 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 19649b31fb..565aff78ec 100755
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -218,13 +218,20 @@ $auth = new auth();
$cache = new cache();
$template = new template();
-// 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('template', 'display')));
+// Add own hook handler, if present. :o
+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)
+ foreach ($cache->obtain_hooks() as $hook)
+ {
+ @include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx);
+ }
+}
+else
{
- @include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx);
+ $phpbb_hook = false;
}
// Set some standard variables we want to force