aboutsummaryrefslogtreecommitdiffstats
path: root/identification.php
diff options
context:
space:
mode:
authornikrou <nikrou@piwigo.org>2006-10-04 20:50:20 +0000
committernikrou <nikrou@piwigo.org>2006-10-04 20:50:20 +0000
commitd5b1c1be9e8dff671abab816efca302917bbdece (patch)
treeb5832b0b653fca7da44412f24bff93ce188aefd5 /identification.php
parentcbf63ed4e20aa32ba7c3c5b58d1112cc4dcfef11 (diff)
Fix bug 451: Auto login does not work properly
svn merge r1492:1493 from trunk svn merge r1510:1511 from trunk svn merge r1521:1522 from trunk svn merge r1523:1524 from trunk svn merge r1525:1526 from trunk auto_login key add to users table: - add update script - update upgrade_1.5.0.php script (related to svn:1553) git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1554 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'identification.php')
-rw-r--r--identification.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/identification.php b/identification.php
index df2df9b87..9bfdef96f 100644
--- a/identification.php
+++ b/identification.php
@@ -63,7 +63,7 @@ SELECT '.$conf['user_fields']['id'].' AS id,
{
$remember_me = true;
}
- log_user( $row['id'], $remember_me);
+ log_user($row['id'], $remember_me);
redirect(empty($redirect_to) ? make_index_url() : $redirect_to);
}
else
@@ -71,6 +71,10 @@ SELECT '.$conf['user_fields']['id'].' AS id,
array_push( $errors, $lang['invalid_pwd'] );
}
}
+elseif (!empty($_COOKIE[$conf['remember_me_name']]))
+{
+ auto_login();
+}
//----------------------------------------------------- template initialization
//
// Start output of page