diff options
| author | Brice Maron <brice@bmaron.net> | 2012-06-21 21:15:35 +0400 |
|---|---|---|
| committer | Brice Maron <brice@bmaron.net> | 2012-06-21 21:15:35 +0400 |
| commit | e5c56b2433b1987e4b6b8020e01f4da03623c4b8 (patch) | |
| tree | a650870f7bbc497833b8ea00051f9046e1779f5e /remote.php | |
| parent | df83df5263db57056d0bd70edfa3b28e7b5e6b6b (diff) | |
| parent | 6707e4187e4c1186eff8dfe06999c4539ab80de7 (diff) | |
Merge branch 'master' into multi_app_dir
Conflicts:
lib/app.php
lib/base.php
lib/minimizer/css.php
lib/minimizer/js.php
lib/template.php
lib/util.php
Diffstat (limited to 'remote.php')
| -rw-r--r-- | remote.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/remote.php b/remote.php index 9fb73c4ce1d..a58b1c0a0fc 100644 --- a/remote.php +++ b/remote.php @@ -5,7 +5,7 @@ require_once('lib/base.php'); if (array_key_exists('PATH_INFO', $_SERVER)){ $path_info = $_SERVER['PATH_INFO']; }else{ - $path_info = substr($_SERVER['PHP_SELF'], strpos($_SERVER['PHP_SELF'], basename(__FILE__)) + strlen(basename(__FILE__))); + $path_info = substr($_SERVER['REQUEST_URI'], strlen($_SERVER['SCRIPT_NAME'])); } if ($path_info === false) { OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND); |