Merge branch 'master' into goto_user

cziehr · Sep 26, 2020 · f383ea9 · f383ea9
2 parents e71d2b9 + 35aec04
commit f383ea9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/action.php b/action.php
@@ -20,7 +20,7 @@ function handle_act(Doku_Event $event, $param) {
 	    $user = $_SERVER['REMOTE_USER'];
 		if(!$user) return;
 		$auto_login = $this->getConf('auto_login');	
-        if(!$auto_login) {       
+        if(!$auto_login) {  
            return;	
         }
 

diff --git a/script.js b/script.js
@@ -16,10 +16,9 @@ function goto_redirect(which,mode) {
        which = which.replace(/user/, user);
       }
       location.href = which;
+
       clearTimeout(goto_tm);
-      setGotoCookie("GOTO_LOGIN", "") ;
-
-
+      setGotoCookie("GOTO_LOGIN", "") ; 
 }
 function goto_getCookie(name) {
     var re = new RegExp(name + "=([^;]+)");