tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-29 20:59:23 +02:00
Code Issues Projects Releases Wiki Activity

BUGFIX: Use locally included Zend framework components in favour of those installed with PEAR (from r97036)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102426 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-04-12 03:34:59 +00:00
parent fee361baaf
commit 469d0b7708
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/Core.php
View File

@ -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