diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2016-03-17 17:32:38 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2016-03-17 17:32:38 +0100 |
| commit | 24abe1e1e1a9945d800ed446a3b5a3907df6a7dd (patch) | |
| tree | 296d02a1c731263ba985e8e59295885c6f466b87 | |
| parent | 8fb3e446107da26ac654ffc25af6814a17cb9022 (diff) | |
| download | nextcloud-server-24abe1e1e1a9945d800ed446a3b5a3907df6a7dd.tar.gz nextcloud-server-24abe1e1e1a9945d800ed446a3b5a3907df6a7dd.zip | |
Use raw PATH_INFO
PATH_INFO will be empty at this point and thus the logic in base.php did not catch this. Changing this to "getRawPathInfo" will ensure that the path info is properly read.
Fixes https://github.com/owncloud/core/issues/23199
| -rw-r--r-- | .htaccess | 4 | ||||
| -rw-r--r-- | lib/base.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.htaccess b/.htaccess index 4837df6adbe..df074f7f806 100644 --- a/.htaccess +++ b/.htaccess @@ -62,8 +62,8 @@ # Rewrite rules for `front_controller_active` Options -MultiViews - RewriteRule ^core/js/oc.js$ index.php/core/js/oc.js [PT,E=PATH_INFO:$1] - RewriteRule ^core/preview.png$ index.php/core/preview.png [PT,E=PATH_INFO:$1] + RewriteRule ^core/js/oc.js$ index.php [PT,E=PATH_INFO:$1] + RewriteRule ^core/preview.png$ index.php [PT,E=PATH_INFO:$1] RewriteCond %{REQUEST_FILENAME} !\.(css|js|svg|gif|png|html|ttf|woff|ico|jpg|jpeg)$ RewriteCond %{REQUEST_FILENAME} !core/img/favicon.ico$ RewriteCond %{REQUEST_FILENAME} !/remote.php diff --git a/lib/base.php b/lib/base.php index 7659148c140..16db8f4dcd2 100644 --- a/lib/base.php +++ b/lib/base.php @@ -823,7 +823,7 @@ class OC { } $request = \OC::$server->getRequest(); - $requestPath = $request->getPathInfo(); + $requestPath = $request->getRawPathInfo(); if (substr($requestPath, -3) !== '.js') { // we need these files during the upgrade self::checkMaintenanceMode(); self::checkUpgrade(); |