From 5047d43ca3bd96160210bdbc8a3eef2d3c01ae54 Mon Sep 17 00:00:00 2001
From: "Paul S. Owen" <psotfx@users.sourceforge.net>
Date: Thu, 21 Mar 2002 13:34:02 +0000
Subject: [PATCH] This one has the added benefit of working ...

git-svn-id: file:///svn/phpbb/trunk@2389 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/usercp_register.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/phpBB/includes/usercp_register.php b/phpBB/includes/usercp_register.php
index fbe7f3ff65..24b3194c67 100644
--- a/phpBB/includes/usercp_register.php
+++ b/phpBB/includes/usercp_register.php
@@ -253,12 +253,7 @@ if ( isset($HTTP_POST_VARS['submit']) )
 			}
 		}
 	}
-	else if ( empty($password) && empty($password_confirm) )
-	{
-		$error = TRUE;
-		$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Password_mismatch'];
-	}
-	else 
+	else if ( ( empty($password) && !empty($password_confirm) ) || ( !empty($password) && empty($password_confirm) ) || ( empty($password) && empty($password_confirm) && $mode == 'register' ) )
 	{
 		$error = TRUE;
 		$error_msg .= ( ( isset($error_msg) ) ? '<br />' : '' ) . $lang['Password_mismatch'];