diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2016-03-17 19:32:38 +0300 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2016-03-18 12:30:26 +0300 |
| commit | d9b632c00177e0625ef06e31e19ea1157546ebb4 (patch) | |
| tree | 19d008b23b9026dd80b2c0ede918961fa57a2cc0 | |
| parent | 382b18e85e021afbe738f8b21086908acb534248 (diff) | |
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 82f13aa26c7..3c5affd8233 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)$ RewriteCond %{REQUEST_FILENAME} !core/img/favicon.ico$ RewriteCond %{REQUEST_FILENAME} !/remote.php diff --git a/lib/base.php b/lib/base.php index 70498f31567..36e5cd89d79 100644 --- a/lib/base.php +++ b/lib/base.php @@ -830,7 +830,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(); |