summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-10-16 17:36:55 +0200
committerBenny Baumann <BenBE@geshi.org>2013-10-16 17:36:55 +0200
commit7385b4579b057cc56a2c8eb6c287e765cdbca42e (patch)
tree3fc28930d0c215a0bf0e7a8832d7dbbf63269119 /includes
parent8947e9bec9c0b39a62fb852f3e87702cfadb9211 (diff)
parent68056545c7f7d1bd210c05b3034436a984b0d7ff (diff)
downloadcacert-devel-7385b4579b057cc56a2c8eb6c287e765cdbca42e.tar.gz
cacert-devel-7385b4579b057cc56a2c8eb6c287e765cdbca42e.tar.xz
cacert-devel-7385b4579b057cc56a2c8eb6c287e765cdbca42e.zip
Merge branch 'bug-569' into release
Diffstat (limited to 'includes')
-rw-r--r--includes/account.php6
1 files changed, 4 insertions, 2 deletions
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();