mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
BUGFIX: Use locally included Zend framework components in favour of those installed with PEAR
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97036 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
7f2f5b79f0
commit
5718a6a3d1
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user