From eb3b53198c904af2182dfbd38957742ce994e47a Mon Sep 17 00:00:00 2001
From: graf25 <graf25@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Fri, 19 Apr 2002 03:58:17 +0000
Subject: [PATCH] Noting changes, plus committing the "expunge"->"purge"
 change.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@2751 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 ChangeLog         | 4 +++-
 src/left_main.php | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 00409bb8..23bb277b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,9 @@
 
 Version 1.2.6 -- CVS
 --------------------
-  - Changing "emtpy" to "expunge" for more clarity.
+  - Fix for cross-site scripting vulnerability (bug #545933)
+    Reported by Nick Cleaton.
+  - Changing "emtpy" to "purge" for more clarity.
   - Fix for cross-site scripting vulnerability (bug #544658)
     Reported by Nick Cleaton.
   - Fix for incorrect word wrap in Opera (bug #495073)
diff --git a/src/left_main.php b/src/left_main.php
index 8b9199fc..70c7ce6f 100644
--- a/src/left_main.php
+++ b/src/left_main.php
@@ -94,7 +94,7 @@ function formatMailboxName($imapConnection, $box_array) {
         if ($numMessages > 0) {
             $urlMailbox = urlencode($real_box);
             $line .= "\n<small>\n" .
-                    "&nbsp;&nbsp;(<A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("expunge")."</A>)" .
+                    "&nbsp;&nbsp;(<A HREF=\"empty_trash.php\" style=\"text-decoration:none\">"._("purge")."</A>)" .
                     "</small>";
         }
     }
-- 
2.25.1