aboutsummaryrefslogtreecommitdiffstats
path: root/identification.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2006-10-21 20:16:01 +0000
committerrvelices <rv-github@modusoptimus.com>2006-10-21 20:16:01 +0000
commit641d335cff78b6e04c625ad3679547b73c1bb829 (patch)
tree9ec2e38e6b42d59e4050d8fd5865517dcd760e5c /identification.php
parent8d7aa23a8e160c27bec20a21051b2d26217bcec9 (diff)
merge -r1568 from trunk to branch-1_6 (auto_login/redirect corrections)
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1572 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'identification.php')
-rw-r--r--identification.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/identification.php b/identification.php
index 9bfdef96f..f5131e431 100644
--- a/identification.php
+++ b/identification.php
@@ -71,10 +71,7 @@ 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