Fix installer issues with changes to code

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@40487 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
aoneil 2007-08-20 01:42:37 +00:00
parent 9e80b5e840
commit b78b8e29f6

View File

@ -530,18 +530,23 @@ PHP
$_SERVER['SCRIPT_FILENAME'] = dirname($_SERVER['SCRIPT_FILENAME']) . '/sapphire/main.php'; $_SERVER['SCRIPT_FILENAME'] = dirname($_SERVER['SCRIPT_FILENAME']) . '/sapphire/main.php';
chdir('sapphire'); chdir('sapphire');
require_once("core/Core.php"); require_once('core/Core.php');
require_once("core/ManifestBuilder.php"); require_once('core/ManifestBuilder.php');
require_once("core/ClassInfo.php"); require_once('core/ClassInfo.php');
require_once('core/Object.php'); require_once('core/Object.php');
require_once('core/control/Director.php'); require_once('core/control/Director.php');
require_once('core/ViewableData.php');
require_once('core/Session.php');
require_once('core/control/Controller.php');
require_once('filesystem/Filesystem.php'); require_once('filesystem/Filesystem.php');
echo "<li>Building database schema...</li>"; echo "<li>Building database schema...</li>";
flush(); flush();
// Build database // Build database
$_GET['flush'] = true;
$con = new Controller();
$con->pushCurrent();
ManifestBuilder::compileManifest(); ManifestBuilder::compileManifest();
$dbAdmin = new DatabaseAdmin(); $dbAdmin = new DatabaseAdmin();
$dbAdmin->init(); $dbAdmin->init();
@ -562,8 +567,8 @@ PHP
} else { } else {
echo "<p>Installed SilverStripe successfully. I will now try and direct you to echo "<p>Installed SilverStripe successfully. I will now try and direct you to
<a href=\"home/successfullyinstalled\">home/successfullyinstalled</a> to confirm that the installation was successful.</p> <a href=\"home/successfullyinstalled?flush=1\">home/successfullyinstalled</a> to confirm that the installation was successful.</p>
<script>setTimeout(function() { window.location.href = 'home/successfullyinstalled'; }, 1000);</script> <script>setTimeout(function() { window.location.href = 'home/successfullyinstalled?flush=1'; }, 1000);</script>
"; ";
} }
} }