From 469d0b77081a2fa6919ae01a23491ed88e31b52f Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 12 Apr 2010 03:34:59 +0000 Subject: [PATCH] BUGFIX: Use locally included Zend framework components in favour of those installed with PEAR (from r97036) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102426 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/Core.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/core/Core.php b/core/Core.php index 5b231b871..2253ca133 100755 --- a/core/Core.php +++ b/core/Core.php @@ -149,11 +149,15 @@ require_once('filesystem/Filesystem.php'); require_once("core/Session.php"); /** - * Add thirdparty include paths + * Add sapphire/parsers and sapphire/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'); + +// 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/parsers' + . BASE_PATH . '/sapphire/thirdparty' . PATH_SEPARATOR + , get_include_path())); /////////////////////////////////////////////////////////////////////////////// // MANIFEST