4 files changed, 58 insertions, 40 deletions
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 2e09e95ea7..b18a9dce1b 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -252,8 +252,10 @@ $paths = array($phpbb_root_path . 'install/update/new/adm/style', $phpbb_admin_p
 $paths = array_filter($paths, 'is_dir');
 $template->set_custom_style('adm', $paths);
 
-$template->assign_var('T_ASSETS_PATH', '../assets');
-$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style');
+$path = array_shift($paths);
+
+$template->assign_var('T_ASSETS_PATH', $path . '/../../assets');
+$template->assign_var('T_TEMPLATE_PATH', $path);
 
 $install = new module();
 
@@ -397,7 +399,7 @@ class module
 		}
 
 		define('HEADER_INC', true);
-		global $template, $lang, $stage, $phpbb_root_path, $phpbb_admin_path;
+		global $template, $lang, $stage, $phpbb_admin_path, $path;
 
 		$template->assign_vars(array(
 			'L_CHANGE'				=> $lang['CHANGE'],
@@ -407,7 +409,7 @@ class module
 			'L_SKIP'				=> $lang['SKIP'],
 			'PAGE_TITLE'			=> $this->get_page_title(),
 			'T_IMAGE_PATH'			=> htmlspecialchars($phpbb_admin_path) . 'images/',
-			'T_JQUERY_LINK'			=> $phpbb_root_path . 'assets/javascript/jquery.js',
+			'T_JQUERY_LINK'			=> $path . '/../../assets/javascript/jquery.js',
 
 			'S_CONTENT_DIRECTION' 	=> $lang['DIRECTION'],
 			'S_CONTENT_FLOW_BEGIN'	=> ($lang['DIRECTION'] == 'ltr') ? 'left' : 'right',
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index 1c7e2dca76..a837e9d52a 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -79,6 +79,21 @@ class convert
 */
 class install_convert extends module
 {
+	/** @var array */
+	protected $lang;
+
+	/** @var string */
+	protected $language;
+
+	/** @var \phpbb\template\template */
+	protected $template;
+
+	/** @var string */
+	protected $phpbb_root_path;
+
+	/** @var string */
+	protected $php_ext;
+
 	/**
 	* Variables used while converting, they are accessible from the global variable $convert
 	*/
@@ -94,6 +109,16 @@ class install_convert extends module
 
 		$this->tpl_name = 'install_convert';
 		$this->mode = $mode;
+		$this->lang = $lang;
+		$this->language = $language;
+		$this->template = $template;
+		$this->phpbb_root_path = $phpbb_root_path;
+		$this->php_ext = $phpEx;
+
+		if (!$this->check_phpbb_installed())
+		{
+			return;
+		}
 
 		$convert = new convert($this->p_master);
 
@@ -108,25 +133,6 @@ class install_convert extends module
 		switch ($sub)
 		{
 			case 'intro':
-				// Try opening config file
-				// @todo If phpBB is not installed, we need to do a cut-down installation here
-				// For now, we redirect to the installation script instead
-				if (@file_exists($phpbb_root_path . 'config.' . $phpEx))
-				{
-					include($phpbb_root_path . 'config.' . $phpEx);
-				}
-
-				if (!defined('PHPBB_INSTALLED'))
-				{
-					$template->assign_vars(array(
-						'S_NOT_INSTALLED'		=> true,
-						'TITLE'					=> $lang['BOARD_NOT_INSTALLED'],
-						'BODY'					=> sprintf($lang['BOARD_NOT_INSTALLED_EXPLAIN'], append_sid($phpbb_root_path . 'install/index.' . $phpEx, 'mode=install&amp;language=' . $language)),
-					));
-
-					return;
-				}
-
 				require($phpbb_root_path . 'config.' . $phpEx);
 				require($phpbb_root_path . 'includes/constants.' . $phpEx);
 				require($phpbb_root_path . 'includes/functions_convert.' . $phpEx);
@@ -259,6 +265,30 @@ class install_convert extends module
 	}
 
 	/**
+	* Check whether phpBB is installed.
+	* Assigns error template vars if not installed.
+	*
+	* @return bool Returns true if phpBB is installed.
+	*/
+	public function check_phpbb_installed()
+	{
+		if (phpbb_check_installation_exists($this->phpbb_root_path, $this->php_ext))
+		{
+			return true;
+		}
+
+		$this->page_title = 'BOARD_NOT_INSTALLED';
+		$install_url = append_sid($this->phpbb_root_path . 'install/index.' . $this->php_ext, 'mode=install&amp;language=' . $this->language);
+
+		$this->template->assign_vars(array(
+			'S_NOT_INSTALLED'		=> true,
+			'BODY'					=> sprintf($this->lang['BOARD_NOT_INSTALLED_EXPLAIN'], $install_url),
+		));
+
+		return false;
+	}
+
+	/**
 	* Generate a list of all available conversion modules
 	*/
 	function list_convertors($sub)
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index a2d44f2b6c..72e6f6affa 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -18,14 +18,9 @@ if (!defined('IN_INSTALL'))
 if (!empty($setmodules))
 {
 	// If phpBB is already installed we do not include this module
-	if (@file_exists($phpbb_root_path . 'config.' . $phpEx) && !file_exists($phpbb_root_path . 'cache/install_lock'))
+	if (phpbb_check_installation_exists($phpbb_root_path, $phpEx) && !file_exists($phpbb_root_path . 'cache/install_lock'))
 	{
-		include_once($phpbb_root_path . 'config.' . $phpEx);
-
-		if (defined('PHPBB_INSTALLED'))
-		{
-			return;
-		}
+		return;
 	}
 
 	$module[] = array(
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 5891efb375..cdfb7ecb06 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -19,16 +19,7 @@ if (!defined('IN_INSTALL'))
 if (!empty($setmodules))
 {
 	// If phpBB is not installed we do not include this module
-	if (@file_exists($phpbb_root_path . 'config.' . $phpEx) && !@file_exists($phpbb_root_path . 'cache/install_lock'))
-	{
-		include_once($phpbb_root_path . 'config.' . $phpEx);
-
-		if (!defined('PHPBB_INSTALLED'))
-		{
-			return;
-		}
-	}
-	else
+	if (!phpbb_check_installation_exists($phpbb_root_path, $phpEx) || file_exists($phpbb_root_path . 'cache/install_lock'))
 	{
 		return;
 	}