fix redirect to desired page after login

diff --git a/index.php b/index.php
index 9cec3201e1c4d7891bb04923d24e1d3deea8c042..8eea0fe454f34a57d417f34a3e54378d425cc0aa 100644 (file)
--- a/index.php
+++ b/index.php
@@ -117,6 +117,6 @@ elseif(OC_User::isLoggedIn()) {
        if(!array_key_exists('sectoken', $_SESSION) || (array_key_exists('sectoken', $_SESSION) && is_null(OC::$REQUESTEDFILE)) || substr(OC::$REQUESTEDFILE, -3) == 'php'){
                $sectoken=rand(1000000,9999999);
                $_SESSION['sectoken']=$sectoken;
-               OC_Template::printGuestPage('', 'login', array('error' => $error, 'sectoken' => $sectoken, 'redirect' => isset($_REQUEST['redirect_url'])?htmlentities($_REQUEST['redirect_url']):'' ));
+               OC_Template::printGuestPage('', 'login', array('error' => $error, 'sectoken' => $sectoken, 'redirect' => $_SERVER['REQUEST_URI']));
        }
 }

diff --git a/lib/util.php b/lib/util.php
index 3c5eae2c0adf2f73032a12d746964194a8ffc07a..0e4f3689e7935aedad2376824996ce1ef4219cc5 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -312,7 +312,7 @@ class OC_Util {
        */
        public static function redirectToDefaultPage(){
                if(isset($_REQUEST['redirect_url'])) {
-                       header( 'Location: '.htmlentities($_REQUEST['redirect_url']));
+                       header( 'Location: '.$_REQUEST['redirect_url']);
                } else {
                        header( 'Location: '.OC::$WEBROOT.'/'.OC_Appconfig::getValue('core', 'defaultpage', '?app=files'));
                }