diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-02-26 14:21:06 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-02-26 14:21:06 +0100 |
| commit | d4d09b06f80462394983fe04d291a0345dd57280 (patch) | |
| tree | e4452055533c7ec7bb6fa49ac7f6b5c93ba8c4f7 /lib/base.php | |
| parent | ea8f71a19c59e7138d4a504bacc0beb410fc77e8 (diff) | |
| parent | 3d0d47957e65a72e17d33a924c9c4efcd5088ed2 (diff) | |
| download | nextcloud-server-d4d09b06f80462394983fe04d291a0345dd57280.tar.gz nextcloud-server-d4d09b06f80462394983fe04d291a0345dd57280.zip | |
merge master into encryption
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/base.php b/lib/base.php index 85afaa62258..ee1a86399ac 100644 --- a/lib/base.php +++ b/lib/base.php @@ -143,6 +143,13 @@ class OC{ $scriptName=$_SERVER["SCRIPT_NAME"]; if(substr($scriptName,-1)=='/'){ $scriptName.='index.php'; + //make sure suburi follows the same rules as scriptName + if(substr(OC::$SUBURI,-9)!='index.php'){ + if(substr(OC::$SUBURI,-1)!='/'){ + OC::$SUBURI=OC::$SUBURI.'/'; + } + OC::$SUBURI=OC::$SUBURI.'index.php'; + } } OC::$WEBROOT=substr($scriptName,0,strlen($scriptName)-strlen(OC::$SUBURI)); |