r31k/bludit
2
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge d8a73e7951f2408c6ac1fc79b7540be0b71f25b6 into 91e1911308a0e458e63e0c14733d876ae4d57a7a

Browse Source
This commit is contained in:
Jonathan Holvey 2017-09-03 14:50:56 +00:00 committed by GitHub
commit a2082978be
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bl-kernel/boot/init.php
View File

@ -209,12 +209,16 @@ elseif( empty($base) ) {
$base = dirname($base);
}
if($base!=DS) {
// Assume URLs are rewritten to server root if current URL doesn't start with $base
if (strpos($_SERVER['REQUEST_URI'], $base) !== 0) {
$base = '/';
}
if($base!=DS and strlen($base > 0)) {
$base = trim($base, '/');
$base = '/'.$base.'/';
}
else {
// Workaround for Windows Web Servers
$base = '/';
}

8
install.php
View File

@ -84,12 +84,16 @@ elseif( empty($base) ) {
$base = dirname($base);
}
if($base!=DS) {
// Assume URLs are rewritten to server root if current URL doesn't start with $base
if (strpos($_SERVER['REQUEST_URI'], $base) !== 0) {
$base = '/';
}
if($base!=DS and strlen($base > 0)) {
$base = trim($base, '/');
$base = '/'.$base.'/';
}
else {
// Workaround for Windows Web Servers
$base = '/';
}