diff --git a/inc/auth.php b/inc/auth.php index 26246ba1bd54fc8d084b284e6581a462396fe04c..fa087e8f6b0a04bcf426dcda78393219c0e6a130 100644 --- a/inc/auth.php +++ b/inc/auth.php @@ -292,9 +292,9 @@ function auth_logoff($keepbc=false){ $USERINFO=null; //FIXME if (version_compare(PHP_VERSION, '5.2.0', '>')) { - setcookie(DOKU_COOKIE,'',time()-600000,DOKU_REL,($conf['securecookie'] && is_ssl()),true); + setcookie(DOKU_COOKIE,'',time()-600000,DOKU_REL,'',($conf['securecookie'] && is_ssl()),true); }else{ - setcookie(DOKU_COOKIE,'',time()-600000,DOKU_REL,($conf['securecookie'] && is_ssl())); + setcookie(DOKU_COOKIE,'',time()-600000,DOKU_REL,'',($conf['securecookie'] && is_ssl())); } if($auth && $auth->canDo('logoff')){ @@ -1001,7 +1001,6 @@ function auth_setCookie($user,$pass,$sticky) { }else{ setcookie(DOKU_COOKIE,$cookie,$time,DOKU_REL,'',($conf['securecookie'] && is_ssl())); } - // set session $_SESSION[DOKU_COOKIE]['auth']['user'] = $user; $_SESSION[DOKU_COOKIE]['auth']['pass'] = $pass;