From ee9263b0ba8d1d368099edc1c80a3fa58c5e8acb Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 23 Sep 2007 11:04:50 +0000
Subject: allow new installations...

git-svn-id: file:///svn/phpbb/trunk@8102 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/install_convert.html |  2 +-
 phpBB/common.php                     |  2 +-
 phpBB/install/index.php              | 11 ++++++++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'phpBB')

diff --git a/phpBB/adm/style/install_convert.html b/phpBB/adm/style/install_convert.html
index 506924720e..783e89d6bf 100755
--- a/phpBB/adm/style/install_convert.html
+++ b/phpBB/adm/style/install_convert.html
@@ -30,7 +30,7 @@
 			<th>{L_SOFTWARE}</th>
 			<th>{L_VERSION}</th>
 			<th>{L_AUTHOR}</th>
-			<th>{L_CONVERT_OPTIONS}</th>
+			<th>{L_OPTIONS}</th>
 		</tr>
 		</thead>
 		<tbody>
diff --git a/phpBB/common.php b/phpBB/common.php
index 2d8a654dac..34f8071a83 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -196,7 +196,7 @@ $phpbb_hook = new phpbb_hook(array('exit_handler', 'phpbb_user_session_handler',
 
 foreach ($cache->obtain_hooks() as $hook)
 {
-	include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx);
+	@include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx);
 }
 
 ?>
\ No newline at end of file
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index c916ee9df4..19649b31fb 100755
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -211,13 +211,22 @@ $mode = request_var('mode', 'overview');
 $sub = request_var('sub', '');
 
 // Set PHP error handler to ours
-set_error_handler('msg_handler');
+set_error_handler(defined('PHPBB_MSG_HANDLER') ? PHPBB_MSG_HANDLER : 'msg_handler');
 
 $user = new user();
 $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')));
+
+foreach ($cache->obtain_hooks() as $hook)
+{
+	@include($phpbb_root_path . 'includes/hooks/' . $hook . '.' . $phpEx);
+}
+
 // Set some standard variables we want to force
 $config = array(
 	'load_tplcompile'	=> '1'
-- 
cgit v1.2.1