diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-11-24 23:27:44 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-11-24 23:27:44 +0100 |
| commit | 37b07fe6a9e512214852584fb15056f008509882 (patch) | |
| tree | 6200a40da93696df4e3e5863308757f4b0b2ece2 /lib/private/request.php | |
| parent | 14332681fc541aca936dcbd6baf7de220734815f (diff) | |
| parent | a2d4cd87d05392058d6837e8feea4fffb3e55faa (diff) | |
| download | nextcloud-server-37b07fe6a9e512214852584fb15056f008509882.tar.gz nextcloud-server-37b07fe6a9e512214852584fb15056f008509882.zip | |
Merge branch 'master' into fix-5388-master
Diffstat (limited to 'lib/private/request.php')
| -rwxr-xr-x | lib/private/request.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/request.php b/lib/private/request.php index df33217f95d..d11e5b16cfe 100755 --- a/lib/private/request.php +++ b/lib/private/request.php @@ -9,6 +9,7 @@ class OC_Request { /** * @brief Check overwrite condition + * @param string $type * @returns bool */ private static function isOverwriteCondition($type = '') { @@ -99,7 +100,7 @@ class OC_Request { public static function scriptName() { $name = $_SERVER['SCRIPT_NAME']; if (OC_Config::getValue('overwritewebroot', '') !== '' and self::isOverwriteCondition()) { - $serverroot = str_replace("\\", '/', substr(__DIR__, 0, -4)); + $serverroot = str_replace("\\", '/', substr(__DIR__, 0, -strlen('lib/private/'))); $suburi = str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen($serverroot))); $name = OC_Config::getValue('overwritewebroot', '') . $suburi; } |