From 312c7aec07c501aaec57f12ceaacf2981f46194b Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Sun, 5 Dec 2010 08:40:28 +0000 Subject: [PATCH] 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 --- core/Core.php | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/core/Core.php b/core/Core.php index d251d511f..8011ac61f 100755 --- a/core/Core.php +++ b/core/Core.php @@ -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.