From ef08421ed7aa1c2b88b0eba4024851c3b355de13 Mon Sep 17 00:00:00 2001
From: Hayden Smith <hayden.g.smith@gmail.com>
Date: Tue, 12 Aug 2008 21:59:32 +0000
Subject: [PATCH] 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
---
 core/ManifestBuilder.php | 2 +-
 main.php                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/ManifestBuilder.php b/core/ManifestBuilder.php
index 02bf24a0c..7ddb4fce1 100644
--- a/core/ManifestBuilder.php
+++ b/core/ManifestBuilder.php
@@ -2,7 +2,7 @@
 /**
  * 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.
diff --git a/main.php b/main.php
index 6269e7546..a88cad3a8 100644
--- a/main.php
+++ b/main.php
@@ -89,7 +89,6 @@ if ($memory < (32 * 1024 * 1024)) {
 }
 
 
-require_once("core/ManifestBuilder.php");
 require_once("core/ClassInfo.php");
 require_once('core/Object.php');
 require_once('core/control/Director.php');
@@ -113,6 +112,7 @@ if (isset($_GET['url'])) {
 	if ($_GET) $_REQUEST = array_merge((array)$_REQUEST, (array)$_GET);
 }
 
+require_once("core/ManifestBuilder.php");
 if (ManifestBuilder::staleManifest()) {
 	ManifestBuilder::compileManifest();
 }