mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
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
This commit is contained in:
parent
d7a4ae6a8f
commit
a30532becb
@ -67,13 +67,6 @@ define('ASSETS_PATH', BASE_PATH . '/' . ASSETS_DIR);
|
|||||||
*/
|
*/
|
||||||
require_once("core/Core.php");
|
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
|
* Priorities definition. These constants are used in calls to _t() as an optional argument
|
||||||
*/
|
*/
|
||||||
|
@ -6,6 +6,13 @@
|
|||||||
* @subpackage core
|
* @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
|
* Returns the temporary folder that sapphire/silverstripe should use for its cache files
|
||||||
* This is loaded into the TEMP_FOLDER define on start up
|
* This is loaded into the TEMP_FOLDER define on start up
|
||||||
|
7
main.php
7
main.php
@ -69,13 +69,6 @@ define('ASSETS_PATH', BASE_PATH . '/' . ASSETS_DIR);
|
|||||||
*/
|
*/
|
||||||
require_once("core/Core.php");
|
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
|
* Priorities definition. These constants are used in calls to _t() as an optional argument
|
||||||
*/
|
*/
|
||||||
|
Loading…
Reference in New Issue
Block a user