Merge pull request #887 from laf/installer

Updated installer
This commit is contained in:
Daniel Preussker
2015-05-03 10:39:36 +00:00
2 changed files with 9 additions and 11 deletions
+7 -8
View File
@@ -50,6 +50,13 @@ if (strpos($_SERVER['PATH_INFO'], "debug"))
// Set variables
$msg_box = array();
// Check for install.inc.php
if (!file_exists('../config.php') && $_SERVER['PATH_INFO'] != '/install.php')
{
// no config.php does so let's redirect to the install
header('Location: /install.php');
exit;
}
include("../includes/defaults.inc.php");
include("../config.php");
@@ -60,14 +67,6 @@ include("includes/vars.inc.php");
include('includes/plugins.inc.php');
Plugins::start();
// Check for install.inc.php
if (!file_exists('../config.php') && $_SERVER['PATH_INFO'] != '/install.php')
{
// no config.php does so let's redirect to the install
header('Location: /install.php');
exit;
}
$runtime_start = utime();
ob_start();