From 7bbd5f64744a5eba869ee01d15e3a425b73e4f60 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 02 Mar 2007 12:42:04 -0500
Subject: [PATCH] Show localized text for missing subjects (closes #1484243)

---
 CHANGELOG                   |    3 ++-
 program/steps/mail/func.inc |    4 ++++
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index da194bb..4988b49 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,8 +1,9 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
 
-2007/03/01 (thomasb)
+2007/03/02 (thomasb)
 ----------
+- Show "no subject" in message list if subject is missing (closes #1484243)
 - Solved page caching of message preview (closes #1484153)
 - Only use gzip compression if configured (closes #1484236)
 
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index ec257b6..606c977 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -450,6 +450,7 @@
       else if ($col=='subject')
         {
         $cont = Q($IMAP->decode_header($header->$col));
+        if (!$cont) $cont = Q(rcube_label('nosubject'));
         // firefox/mozilla temporary workaround to pad subject with content so that whitespace in rows responds to drag+drop
         $cont .= '<img src="./program/blank.gif" height="5" width="1000" alt="" />';
         }
@@ -535,7 +536,10 @@
       if ($col=='from' || $col=='to')
         $cont = Q(rcmail_address_string($header->$col, 3), 'show');
       else if ($col=='subject')
+        {
         $cont = Q($IMAP->decode_header($header->$col));
+        if (!$cont) $cont = Q(rcube_label('nosubject'));
+        }
       else if ($col=='size')
         $cont = show_bytes($header->$col);
       else if ($col=='date')

--
Gitblit v1.9.1