Merged [47081]: Modified construction of manifest to allow custom definition of MANIFEST_FILE constant filename in _config.php.

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60515 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Hayden Smith 2008-08-12 21:59:32 +00:00
parent 9852fd104b
commit ef08421ed7
2 changed files with 2 additions and 2 deletions

View File

@ -2,7 +2,7 @@
/** /**
* Define a constant for the name of the manifest file * Define a constant for the name of the manifest file
*/ */
define("MANIFEST_FILE", TEMP_FOLDER . "/manifest-" . str_replace('.php','',basename($_SERVER['SCRIPT_FILENAME']))); if(!defined('MANIFEST_FILE')) define("MANIFEST_FILE", TEMP_FOLDER . "/manifest-" . str_replace('.php','',basename($_SERVER['SCRIPT_FILENAME'])));
/** /**
* The ManifestBuilder class generates the manifest file and keeps it fresh. * The ManifestBuilder class generates the manifest file and keeps it fresh.

View File

@ -89,7 +89,6 @@ if ($memory < (32 * 1024 * 1024)) {
} }
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');
@ -113,6 +112,7 @@ if (isset($_GET['url'])) {
if ($_GET) $_REQUEST = array_merge((array)$_REQUEST, (array)$_GET); if ($_GET) $_REQUEST = array_merge((array)$_REQUEST, (array)$_GET);
} }
require_once("core/ManifestBuilder.php");
if (ManifestBuilder::staleManifest()) { if (ManifestBuilder::staleManifest()) {
ManifestBuilder::compileManifest(); ManifestBuilder::compileManifest();
} }