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

Merge pull request #9460 from chrometoasters/pulls/fix-9459-public-path

Browse Source 
Fix SS_BASE_URL logic when undefined and docroot without public folder
This commit is contained in:
Garion Herman 2020-04-20 21:06:46 +12:00 committed by GitHub
commit 9aba767e36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/includes/constants.php
View File

@ -148,9 +148,9 @@ if (!defined('BASE_URL')) {
} }
$requestURI = $_SERVER['REQUEST_URI']; $requestURI = $_SERVER['REQUEST_URI'];
// Check if /base/public or /base are in the request // Check if /base/public or /base are in the request (delimited by /)
foreach ([$baseURL, dirname($baseURL)] as $candidate) { foreach ([$baseURL, dirname($baseURL)] as $candidate) {
if (stripos($requestURI, $candidate) === 0) { if (stripos($requestURI, rtrim($candidate, '/') . '/') === 0) {
return $candidate; return $candidate;
} }
} }