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

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114542 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2010-12-05 08:40:28 +00:00
parent e340ccb1ad
commit 312c7aec07

View File

@ -187,24 +187,15 @@ define('PR_LOW',10);
/**
* Ensure we have enough memory
*/
increase_memory_limit_to('64M');
///////////////////////////////////////////////////////////////////////////////
// INCLUDES
/**
* 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
set_include_path(BASE_PATH . '/sapphire' . PATH_SEPARATOR
. BASE_PATH . '/sapphire/parsers' . PATH_SEPARATOR
. BASE_PATH . '/sapphire/thirdparty' . PATH_SEPARATOR
, get_include_path()));
. get_include_path());
/**
* Sapphire class autoloader. Requires the ManifestBuilder to work.