diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-12-07 03:09:19 -0800 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-12-07 03:09:19 -0800 |
| commit | 1e062ea895dbbc5a05997c14ff7bd1e4b71bdc9d (patch) | |
| tree | c0c8d9a74ec4729a991e7b416188b67bcd7131bb /lib/base.php | |
| parent | 380db4a29e6ef931bfbcc48ffecce3b25199405d (diff) | |
| parent | 271b8384e7adc36b7c1a3df813c6a6156c661a0d (diff) | |
| download | nextcloud-server-1e062ea895dbbc5a05997c14ff7bd1e4b71bdc9d.tar.gz nextcloud-server-1e062ea895dbbc5a05997c14ff7bd1e4b71bdc9d.zip | |
Merge pull request #182 from owncloud/fix-redirect
Make the redirect_url working again
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index 273107e9b8a..bde65dcc7d1 100644 --- a/lib/base.php +++ b/lib/base.php @@ -506,6 +506,12 @@ class OC{ require_once 'core/setup.php'; exit(); } + // Handle redirect URL for logged in users + if(isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) { + $location = OC_Helper::makeURLAbsolute(urldecode($_REQUEST['redirect_url'])); + header( 'Location: '.$location ); + return; + } // Handle WebDAV if($_SERVER['REQUEST_METHOD']=='PROPFIND') { header('location: '.OC_Helper::linkToRemote('webdav')); @@ -670,7 +676,7 @@ class OC{ else { OC_User::unsetMagicInCookie(); } - header( 'Location: '.$_SERVER['REQUEST_URI'] ); + OC_Util::redirectToDefaultPage(); exit(); } return true; |