tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUG Inspect current directory for include_path

Browse Source 
This fixes problems where require/include calls rely
on the relative file path, e.g. in i18n.php.

Followup from https://github.com/silverstripe/sapphire/pull/904
This commit is contained in:
Ingo Schommer 2012-11-01 10:10:06 +01:00
parent f861ff9dfa
commit a5fd3cf985
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/Core.php
View File

@ -186,13 +186,13 @@ define('ASSETS_PATH', BASE_PATH . '/' . ASSETS_DIR);
// INCLUDES // INCLUDES
if(defined('CUSTOM_INCLUDE_PATH')) { if(defined('CUSTOM_INCLUDE_PATH')) {
$includePath = CUSTOM_INCLUDE_PATH . PATH_SEPARATOR $includePath = '.' . PATH_SEPARATOR . CUSTOM_INCLUDE_PATH . PATH_SEPARATOR
. FRAMEWORK_PATH . PATH_SEPARATOR . FRAMEWORK_PATH . PATH_SEPARATOR
. FRAMEWORK_PATH . '/parsers' . PATH_SEPARATOR . FRAMEWORK_PATH . '/parsers' . PATH_SEPARATOR
. THIRDPARTY_PATH . PATH_SEPARATOR . THIRDPARTY_PATH . PATH_SEPARATOR
. get_include_path(); . get_include_path();
} else { } else {
$includePath = FRAMEWORK_PATH . PATH_SEPARATOR $includePath = '.' . PATH_SEPARATOR . FRAMEWORK_PATH . PATH_SEPARATOR
. FRAMEWORK_PATH . '/parsers' . PATH_SEPARATOR . FRAMEWORK_PATH . '/parsers' . PATH_SEPARATOR
. THIRDPARTY_PATH . PATH_SEPARATOR . THIRDPARTY_PATH . PATH_SEPARATOR
. get_include_path(); . get_include_path();