diff options
| author | Adrian Lang <dokuwiki@adrianlang.de> | 2010-12-08 17:17:40 +0100 |
|---|---|---|
| committer | Adrian Lang <dokuwiki@adrianlang.de> | 2010-12-08 17:43:28 +0100 |
| commit | fa7c70ff4d7f9999466436e7d559eb0c81571779 (patch) | |
| tree | 3c4e2a1f55fe81f472e582cfea934004c7ad9287 /inc/auth.php | |
| parent | 3733161e2de6b5a7092884f4e39ce8c846ae8f8c (diff) | |
| download | rpg-fa7c70ff4d7f9999466436e7d559eb0c81571779.tar.gz rpg-fa7c70ff4d7f9999466436e7d559eb0c81571779.tar.bz2 | |
tmp
Diffstat (limited to 'inc/auth.php')
| -rw-r--r-- | inc/auth.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/inc/auth.php b/inc/auth.php index 6bc4f8673..f2de4424e 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -194,10 +194,11 @@ function auth_login($user,$pass,$sticky=false,$silent=false){ }else{ // read cookie information list($user,$sticky,$pass) = auth_getCookie(); - // get session info - $session = $_SESSION[DOKU_COOKIE]['auth']; if($user && $pass){ // we got a cookie - see if we can trust it + + // get session info + $session = $_SESSION[DOKU_COOKIE]['auth']; if(isset($session) && $auth->useSessionCache($user) && ($session['time'] >= time()-$conf['auth_security_timeout']) && |