Ticket #8185: Revert "Don't show subject in page header."

This reverts commit ed1e359c809354bee6175215a63a10402ae22c68.
Truncate subject text in header also.

diff --git a/imp/message.php b/imp/message.php
index 1979967..23db289 100644 (file)
--- a/imp/message.php
+++ b/imp/message.php
@@ -288,10 +288,15 @@ foreach (array('to', 'cc', 'bcc') as $val) {
 /* Process the subject now. */
 if ($subject = $mime_headers->getValue('subject')) {
     $display_headers['subject'] = $imp_ui->getDisplaySubject($subject);
+    $title = sprintf(_("%s: %s"), $page_label, $subject);
+    $shortsub = htmlspecialchars($subject);
+    if (strlen($shortsub) > 97) {
+        $shortsub = substr($shortsub, 0, 97) . '...';
+    }
 } else {
-    $display_headers['subject'] = _("[No Subject]");
+    $display_headers['subject'] = $shortsub = _("[No Subject]");
+    $title = sprintf(_("%s: %s"), $page_label, $shortsub);
 }
-$title = sprintf(_("%s: %s"), $page_label, $display_headers['subject']);
 
 /* See if the 'X-Priority' header has been set. */
 $xpriority = $mime_headers->getValue('x-priority');
@@ -422,7 +427,7 @@ if (!IMP::$printMode) {
     $t_template->set('thismailbox', htmlspecialchars($mailbox_name));
     $t_template->set('start', htmlspecialchars($msgindex));
     $t_template->set('index', htmlspecialchars($index));
-    $t_template->set('label', $header_label);
+    $t_template->set('label', sprintf(_("%s: %s"), $header_label, $shortsub));
     $t_template->set('msg_count', sprintf(_("(%d of %d)"), $msgindex, $imp_mailbox->getMessageCount()));
     $t_template->set('status', $status);
     $t_template->set('message_token', $message_token);