Remove atc_display preference.

Simplify preferences by removing - always show the attachment
information inline.

diff --git a/imp/config/prefs.php.dist b/imp/config/prefs.php.dist
index ad76550..3198a4b 100644 (file)
--- a/imp/config/prefs.php.dist
+++ b/imp/config/prefs.php.dist
@@ -103,8 +103,7 @@ $prefGroups['viewing'] = array(
                        'html_image_replacement', 'html_image_addrbook',
                        'highlight_text', 'highlight_simple_markup',
                        'show_quoteblocks', 'dim_signature', 'emoticons',
-                       'parts_display', 'atc_display', 'mail_hdr',
-                       'default_msg_charset')
+                       'parts_display', 'mail_hdr', 'default_msg_charset')
 );
 if (!empty($GLOBALS['conf']['maillog']['use_maillog'])) {
     $prefGroups['viewing']['members'] = array_merge($prefGroups['viewing']['members'], array('disposition_send_mdn'));
@@ -940,18 +939,10 @@ $_prefs['parts_display'] = array(
     'type' => 'enum',
     'enum' => array(
         'all' => _("Show all parts"),
-        'atc' => _("Show attachments only")
+        'atc' => _("Show attachments")
     ),
     'desc' => _("Which message parts do you want to display in the summary?"));
 
-// Should attachment summaries be displayed inline?
-$_prefs['atc_display'] = array(
-    'value' => 1,
-    'locked' => false,
-    'shared' => false,
-    'type' => 'checkbox',
-    'desc' => _("Display attachment summary information within the message text?"));
-
 // Display custom headers (configured via the identity screen) when viewing
 // messages?
 $_prefs['mail_hdr'] = array(

diff --git a/imp/lib/Ui/Message.php b/imp/lib/Ui/Message.php
index ef73e0c..2ba9470 100644 (file)
--- a/imp/lib/Ui/Message.php
+++ b/imp/lib/Ui/Message.php
@@ -492,9 +492,7 @@ class IMP_Ui_Message
                         $atc_parts[] = $mime_id;
                     }
 
-                    if ($GLOBALS['prefs']->getValue('atc_display')) {
-                        $msgtext .= $this->formatSummary($imp_contents->getSummary($mime_id, $contents_mask), $part_info_display, true);
-                    }
+                    $msgtext .= $this->formatSummary($imp_contents->getSummary($mime_id, $contents_mask), $part_info_display, true);
                 }
                 continue;
             }
@@ -538,9 +536,7 @@ class IMP_Ui_Message
                         $atc_parts[] = $id;
                     }
 
-                    if ($GLOBALS['prefs']->getValue('atc_display')) {
-                        $msgtext .= $this->formatSummary($imp_contents->getSummary($id, $contents_mask), $part_info_display, true);
-                    }
+                    $msgtext .= $this->formatSummary($imp_contents->getSummary($id, $contents_mask), $part_info_display, true);
                 }
 
                 if (isset($info['js'])) {