diff options
Diffstat (limited to 'include/user.inc.php')
| -rw-r--r-- | include/user.inc.php | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/include/user.inc.php b/include/user.inc.php index f5c77b2f8..103052ad2 100644 --- a/include/user.inc.php +++ b/include/user.inc.php @@ -43,26 +43,22 @@ if (isset($_COOKIE[session_name()])) setcookie($conf['remember_me_name'], '', 0, cookie_path()); redirect(make_index_url()); } - elseif (empty($_SESSION['pwg_uid'])) - { // timeout - setcookie(session_name(),'',0, - ini_get('session.cookie_path'), - ini_get('session.cookie_domain') - ); - } - else + elseif (!empty($_SESSION['pwg_uid'])) { $user['id'] = $_SESSION['pwg_uid']; } } - // Now check the auto-login if ( $user['id']==$conf['guest_id'] ) { auto_login(); } +if (session_id()=="") +{ + session_start(); +} // using Apache authentication override the above user search if ($conf['apache_authentication'] and isset($_SERVER['REMOTE_USER'])) |