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

BUGFIX Moved set_include_path() directive for including sapphire/thirdparty from sapphire/_config.php to Core class - needs to be loaded before other _config.php files are parsed, to enable e.g. usage of the Money class in a static context

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77435 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-05-20 23:19:08 +00:00
parent 310a85cd9e
commit a7e93c3099
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
_config.php
View File

@ -43,13 +43,6 @@ Director::addRules(1, array(
*/ */
Object::useCustomClass('Datetime','SSDatetime',true); Object::useCustomClass('Datetime','SSDatetime',true);
/**
* Add thirdparty include paths
*/
$path = Director::baseFolder().'/sapphire/parsers/';
set_include_path(str_replace('.' . PATH_SEPARATOR, '.' . PATH_SEPARATOR . $path . PATH_SEPARATOR, get_include_path()));
set_include_path(get_include_path() . PATH_SEPARATOR . BASE_PATH . '/sapphire/thirdparty');
/** /**
* The root directory of TinyMCE * The root directory of TinyMCE

7
core/Core.php
View File

@ -156,6 +156,13 @@ require_once('core/control/Director.php');
require_once('filesystem/Filesystem.php'); require_once('filesystem/Filesystem.php');
require_once("core/Session.php"); require_once("core/Session.php");
/**
* Add thirdparty include paths
*/
$path = Director::baseFolder().'/sapphire/parsers/';
set_include_path(str_replace('.' . PATH_SEPARATOR, '.' . PATH_SEPARATOR . $path . PATH_SEPARATOR, get_include_path()));
set_include_path(get_include_path() . PATH_SEPARATOR . BASE_PATH . '/sapphire/thirdparty');
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// MANIFEST // MANIFEST