From a30532becb2605b0443f3325f32d8472bbb78c0a Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sun, 28 Sep 2008 23:03:28 +0000
Subject: [PATCH] BUGFIX Moved TEMP_FOLDER define back from
 main.php/cli-script.php to Core.php, as it was causing problems with the
 installer

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63204 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 cli-script.php | 7 -------
 core/Core.php  | 7 +++++++
 main.php       | 7 -------
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/cli-script.php b/cli-script.php
index d435b7df5..873b1030e 100755
--- a/cli-script.php
+++ b/cli-script.php
@@ -67,13 +67,6 @@ define('ASSETS_PATH', BASE_PATH . '/' . ASSETS_DIR);
  */
 require_once("core/Core.php");
 
-/**
- * Define the temporary folder if it wasn't defined yet
- */
-if(!defined('TEMP_FOLDER')) {
-	define('TEMP_FOLDER', getTempFolder());
-}
-
 /**
  * Priorities definition. These constants are used in calls to _t() as an optional argument
  */
diff --git a/core/Core.php b/core/Core.php
index 1293bedf9..6ba0e1751 100755
--- a/core/Core.php
+++ b/core/Core.php
@@ -6,6 +6,13 @@
  * @subpackage core
  */
 
+/**
+ * Define the temporary folder if it wasn't defined yet
+ */
+if(!defined('TEMP_FOLDER')) {
+	define('TEMP_FOLDER', getTempFolder());
+}
+
 /**
  * Returns the temporary folder that sapphire/silverstripe should use for its cache files
  * This is loaded into the TEMP_FOLDER define on start up
diff --git a/main.php b/main.php
index 004eaeb71..dac8fc9a5 100644
--- a/main.php
+++ b/main.php
@@ -69,13 +69,6 @@ define('ASSETS_PATH', BASE_PATH . '/' . ASSETS_DIR);
  */
 require_once("core/Core.php");
 
-/**
- * Define the temporary folder if it wasn't defined yet
- */
-if(!defined('TEMP_FOLDER')) {
-	define('TEMP_FOLDER', getTempFolder());
-}
-
 /**
  * Priorities definition. These constants are used in calls to _t() as an optional argument
  */