2 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 053ef19a17..fed5b67545 100755
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -306,13 +306,14 @@ class module
 		}
 
 		define('HEADER_INC', true);
-		global $template, $lang, $stage;
+		global $template, $lang, $stage, $phpbb_root_path;
 
 		$template->assign_vars(array(
 			'L_CHANGE'				=> $lang['CHANGE'],
 			'L_INSTALL_PANEL'		=> $lang['INSTALL_PANEL'],
 			'L_SELECT_LANG'			=> $lang['SELECT_LANG'],
 			'PAGE_TITLE'			=> $this->get_page_title(),
+			'T_IMAGE_PATH'			=> $phpbb_root_path . 'adm/images/',
 
 			'S_CONTENT_DIRECTION' 	=> $lang['DIRECTION'],
 			'S_CONTENT_ENCODING' 	=> $lang['ENCODING'],
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index 48058f4c0e..e0b7333f5a 100755
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -20,9 +20,7 @@ if ( !defined('IN_INSTALL') )
 if (!empty($setmodules))
 {
 	/* If phpBB is already installed we do not include this module
-	// This does not work at the moment because on installation the config file will be written before
-	// everything is finished.
-	if (@file_exists($phpbb_root_path . 'config.' . $phpEx))
+	if (@file_exists($phpbb_root_path . 'config.' . $phpEx) && !file_exists($phpbb_root_path . 'cache/install_lock'))
 	{
 		include_once($phpbb_root_path . 'config.' . $phpEx);