tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX #6201 Use of set_include_path() did not always include sapphire paths in some environments

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@113976 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2010-11-21 22:39:29 +00:00 committed by Sam Minnee
parent 9367dc40a1
commit 10d283a641
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/Core.php
View File

@ -187,24 +187,15 @@ define('PR_LOW',10);
/** /**
* Ensure we have enough memory * Ensure we have enough memory
*/ */
increase_memory_limit_to('64M'); increase_memory_limit_to('64M');
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// INCLUDES // INCLUDES
/** set_include_path(BASE_PATH . '/sapphire' . PATH_SEPARATOR
* Add sapphire/parsers and sapphire/thirdparty include paths, as well as adding a fixed reference
* to BASEPATH/sapphrie in case we chdir()
*/
// Add after the "." path but before other paths (so that they take precedence over the PEAR
// include paths)
set_include_path(str_replace('.' . PATH_SEPARATOR, '.' . PATH_SEPARATOR
. BASE_PATH . '/sapphire' . PATH_SEPARATOR
. BASE_PATH . '/sapphire/parsers' . PATH_SEPARATOR . BASE_PATH . '/sapphire/parsers' . PATH_SEPARATOR
. BASE_PATH . '/sapphire/thirdparty' . PATH_SEPARATOR . BASE_PATH . '/sapphire/thirdparty' . PATH_SEPARATOR
, get_include_path())); . get_include_path());
/** /**
* Sapphire class autoloader. Requires the ManifestBuilder to work. * Sapphire class autoloader. Requires the ManifestBuilder to work.