mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge pull request #916 from chillu/pulls/current-dir-include-path
BUG Inspect current directory for include_path
This commit is contained in:
commit
ead563c07f
@ -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();
|
||||||
|
Loading…
Reference in New Issue
Block a user