diff options
| author | rub <rub@piwigo.org> | 2007-04-27 05:24:01 +0000 |
|---|---|---|
| committer | rub <rub@piwigo.org> | 2007-04-27 05:24:01 +0000 |
| commit | a44bf33a85dffb5991ab5ea469292498fb2696d2 (patch) | |
| tree | 0775ef7ee235e5246cdfd4db683d01d1acb12423 | |
| parent | 53522d541178c182d5926cffd56c00edeed37b7b (diff) | |
Issue 0000682: Error on user registration
On register page when the 2 passwords are not the same, an error occurs but user is also created.
=> Just error must be raised.
Merge BSF 1984:1985 into branch-1_7
git-svn-id: http://piwigo.org/svn/branches/branch-1_7@1986 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | include/functions_user.inc.php | 3 | ||||
| -rw-r--r-- | register.php | 7 |
2 files changed, 3 insertions, 7 deletions
diff --git a/include/functions_user.inc.php b/include/functions_user.inc.php index fb7d32494..5ed6c169f 100644 --- a/include/functions_user.inc.php +++ b/include/functions_user.inc.php @@ -44,11 +44,10 @@ function validate_mail_address( $mail_address ) } } -function register_user($login, $password, $mail_address) +function register_user($login, $password, $mail_address, $errors = array()) { global $lang, $conf; - $errors = array(); if ($login == '') { array_push($errors, $lang['reg_err_login1']); diff --git a/register.php b/register.php index 4d86d5e3b..74980a156 100644 --- a/register.php +++ b/register.php @@ -4,7 +4,6 @@ // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net | // +-----------------------------------------------------------------------+ -// | branch : BSF (Best So Far) // | file : $Id$ // | last update : $Date$ // | last modifier : $Author$ @@ -50,12 +49,10 @@ if (isset($_POST['submit'])) } $errors = - array_merge( - $errors, register_user($_POST['login'], $_POST['password'], - $_POST['mail_address']) - ); + $_POST['mail_address'], + $errors); if (count($errors) == 0) { |