summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2007-03-02 17:42:04 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2007-03-02 17:42:04 +0000
commit3e331a8d90bb48c251183d40c51b00a55f02ba8c (patch)
treed9f013b83feb98ffd8350398934c88656e06b8b5
parentae1617c3ff0ebca9310455fd2c54736f62df9fbf (diff)
Show localized text for missing subjects (closes #1484243)
git-svn-id: https://svn.roundcube.net/trunk@501 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/CHANGELOG3
-rw-r--r--roundcubemail/program/steps/mail/func.inc4
2 files changed, 6 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index da194bb05..4988b49c1 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/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/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc
index ec257b69b..606c977a0 100644
--- a/roundcubemail/program/steps/mail/func.inc
+++ b/roundcubemail/program/steps/mail/func.inc
@@ -450,6 +450,7 @@ function rcmail_message_list($attrib)
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 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE)
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')