add purge link when folder contains subfolders.

Issue does not apply to 1.4.7 (code checks for parent tag) or
default_advanced template (purge link always visible above folder tree).

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11468 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index 4f14814320ffa675ea821a28f48a383b45597e55..d0c7e52d7c5d3dc69cc32a0850d2d86784dd6b68 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -119,9 +119,11 @@ Version 1.5.2 - CVS
     management page in order to allow rename and delete operations with
     subfolders (#1460011).
   - Trash subfolders are allowed in courier. INBOX.Trash is not treated 
-    as special on Courier, unless some SquirrelMail configuration options
-    mark this folder as special (#1354393). Configtest utility should 
+    as special on Courier, unless some SquirrelMail configuration option
+    marks this folder as special (#1354393). Configtest utility should 
     display warning, if Courier IMAP XMAGICTRASH extension is detected.
+  - Show purge link for Trash folder without any messages, if folder has
+    subfolders (#1413569).
 
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------

diff --git a/templates/default/left_main.tpl b/templates/default/left_main.tpl
index 9fb938ab2fbcebd1500a8cde7e0f88dc1b209d11..becdde505993192b5c9149350ddb47a9e98f193a 100644 (file)
--- a/templates/default/left_main.tpl
+++ b/templates/default/left_main.tpl
@@ -188,7 +188,7 @@ function buildMailboxTree ($box, $settings, $indent_factor=0) {
         $end .= '</a>';
 
         // Print unread info
-        if ($box['MessageCount'] > 0) {
+        if ($box['MessageCount'] > 0 || count($box['ChildBoxes'])) {
             if (!empty($unseen_str)) {
                 $end .= '&nbsp;<small>('.$unseen_str.')</small>';
             }