tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Fixed reverting of database code

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42998 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Andrew O'Neil 2007-10-03 00:10:03 +00:00
parent 4d9e93460d
commit fda211156a
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/ManifestBuilder.php
View File

@ -174,19 +174,13 @@ class ManifestBuilder {
$manifest .= "\$_CSS_MANIFEST = " . var_export($cssManifest, true) . ";\n"; $manifest .= "\$_CSS_MANIFEST = " . var_export($cssManifest, true) . ";\n";
DB::connect($databaseConfig); DB::connect($databaseConfig);
if(DB::isActive()) { // Database manifest
// Database manifest $allClasses = ManifestBuilder::allClasses($classManifest);
$allClasses = ManifestBuilder::allClasses($classManifest);
$manifest .= "\$_ALL_CLASSES = " . var_export($allClasses, true) . ";\n";
$manifest .= "\$_ALL_CLASSES = " . var_export($allClasses, true) . ";\n";
global $_ALL_CLASSES;
global $_ALL_CLASSES; $_ALL_CLASSES = $allClasses;
$_ALL_CLASSES = $allClasses;
} else {
if(!isset($_REQUEST['from_installer']))
echo '<li>Waiting until the database is created before compiling ' .
'the manifest</li>';
}
// Write manifest to disk // Write manifest to disk
$manifest = "<?php\n$manifest\n?>"; $manifest = "<?php\n$manifest\n?>";