Permalink
Browse files

BUGFIX #6201 Use of set_include_path() did not always include sapphir…

…e paths in some environments (from r113976)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@114542 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information...
1 parent e340ccb commit 312c7aec07c501aaec57f12ceaacf2981f46194b @sminnee sminnee committed Dec 5, 2010
Showing with 2 additions and 11 deletions.
  1. +2 −11 core/Core.php
View
@@ -187,24 +187,15 @@ function array_fill_keys($keys,$value) {
/**
* 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.

0 comments on commit 312c7ae

Please sign in to comment.