Move the redirect_url from linkTo function to the checkLoggedIn function

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/util.php b/lib/util.php
index aa9fcdec65f..1b1e29b6749 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -240,7 +240,7 @@ class OC_Util {
 
 
 	/**
-	* Check if the app is enabled, send json error msg if not
+	* Check if the app is enabled, redirects to home if not
 	*/
 	public static function checkAppEnabled($app){
 		if( !OC_App::isEnabled($app)){
@@ -250,12 +250,13 @@ class OC_Util {
 	}
 
 	/**
-	* Check if the user is logged in, redirects to home if not
+	* Check if the user is logged in, redirects to home if not. With
+	* redirect URL parameter to the request URI.
 	*/
 	public static function checkLoggedIn(){
 		// Check if we are a user
 		if( !OC_User::isLoggedIn()){
-			header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php', TRUE ));
+			header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' ).'?redirect_url='.urlencode($_SERVER["REQUEST_URI"]));
 			exit();
 		}
 	}