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
This commit is contained in:
rvelices
2006-10-21 20:16:01 +00:00
parent 8d7aa23a8e
commit 641d335cff
7 changed files with 214 additions and 174 deletions
+1 -4
View File
@@ -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