CAcert Code Development list.

[Benny Baumann <benbe AT cacert.org>]

Dear criticals,

it's been some time since we first submitted a fix for Bug 569 and there
were still some issues left. Thus here's a minor tweak for the initially
submitted patch. In order for this to apply propely make sure the
initial patch for bug 569 has been applied and proceed with this one
afterwards.

Thanks got to NEOatNHNG (Michael Tänzer) and BenBE (me) for review as
well as Eva, INOPIAE (Marcus Mängel) and magu (Martin Gummi) for testing
of these adjustments.

Best regards,
BenBE.
diff --git a/includes/account.php b/includes/account.php
index 6a92669..2addca1 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -149,10 +149,12 @@
 		$delcount = 0;
 		if(array_key_exists('delid',$_REQUEST) && is_array($_REQUEST['delid']))
 		{
+			$deltitle=false;
 			foreach($_REQUEST['delid'] as $id)
 			{
-				if (0==$delcount) {
+				if (!$deltitle) {
 					echo _('The following email addresses have been removed:')."<br>\n";
+					$deltitle=true;
 				}
 				$id = intval($id);
 				$query = "select * from `email` where `id`='$id' and `memid`='".intval($_SESSION['profile']['id'])."' and
@@ -173,7 +175,7 @@
 		}
 		if(0 == $delcount)
 		{
-			echo _("You failed to select any accounts to be removed, or you attempted to remove the default account. No action was taken.");
+			echo _("You did not select any accounts to be removed, or you attempted to remove the default account. No action was taken.");
 		}
 
 		showfooter();

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature