Fix incomplete merging from a local branch

diff --git a/imp/js/fullmessage-dimp.js b/imp/js/fullmessage-dimp.js
index d49cf11..6e3083f 100644 (file)
--- a/imp/js/fullmessage-dimp.js
+++ b/imp/js/fullmessage-dimp.js
@@ -149,6 +149,14 @@ var DimpFullmessage = {
                     DimpCompose.confirmCancel();
                 }
                 break;
+
+            default:
+                if (elt.hasClassName('printAtc')) {
+                    DimpCore.popupWindow(DimpCore.addURLParam(DIMP.conf.URI_VIEW, { uid: this.uid, mailbox: this.mailbox, actionID: 'print_attach', id: elt.getAttribute('mimeid') }, true), this.uid + '|' + this.mailbox + '|print', IMP.printWindow);
+                    e.stop();
+                    return;
+                }
+                break;
             }
 
             elt = elt.up();

diff --git a/imp/lib/Views/ShowMessage.php b/imp/lib/Views/ShowMessage.php
index 9866e0b..f379ce4 100644 (file)
--- a/imp/lib/Views/ShowMessage.php
+++ b/imp/lib/Views/ShowMessage.php
@@ -250,7 +250,7 @@ class IMP_Views_ShowMessage
             IMP_Contents::SUMMARY_DESCRIP_LINK |
             IMP_Contents::SUMMARY_DOWNLOAD |
             IMP_Contents::SUMMARY_DOWNLOAD_ZIP |
-            IMP_Contents::SUMMARY_PRINT;
+            IMP_Contents::SUMMARY_PRINT_STUB;
 
         $part_info = $part_info_display = array('icon', 'description', 'size', 'download', 'download_zip');
         $part_info_display[] = 'print';