tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-28 23:49:26 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6292 from webbuilders-group/base-path-fix

Browse Source 
BUGFIX: Fixed crash when BASE_PATH is set by assuming the location of Constants.php
This commit is contained in:
Daniel Hensby 2016-11-04 21:45:50 +00:00 committed by GitHub
commit d66c031244
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Constants.php
View File

@ -188,10 +188,10 @@ if(!defined('BASE_PATH')) {
}
}
// Determine BASE_PATH by assuming that this file is framework/core/Core.php
// Determine BASE_PATH by assuming that this file is framework/src/Core/Constants.php
if(!defined('BASE_PATH')) {
// we can then determine the base path
$candidateBasePath = rtrim(dirname(dirname(dirname(__FILE__))), DIRECTORY_SEPARATOR);
$candidateBasePath = rtrim(dirname(dirname(dirname(dirname(__FILE__)))), DIRECTORY_SEPARATOR);
// We can't have an empty BASE_PATH. Making it / means that double-slashes occur in places but that's benign.
// This likely only happens on chrooted environemnts
if($candidateBasePath == '') $candidateBasePath = DIRECTORY_SEPARATOR;