Do summary generation in _getInlineOutput()

horde · Mar 18, 2015 · efd3054 · efd3054
1 parent d0acce0
commit efd3054
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/imp/lib/Contents/Message.php b/imp/lib/Contents/Message.php
@@ -584,7 +584,7 @@ protected function _getInlineOutput(array $options)
 
                     if ($contents_mask) {
                         $msgtext[$mime_id] = array(
-                            'text' => $this->_formatSummary($mime_id, $contents_mask, true)
+                            'text' => $this->_formatSummary($this->contents->getSummary($mime_id, $contents_mask), true)
                         );
                     }
                 }
@@ -603,7 +603,7 @@ protected function _getInlineOutput(array $options)
                 if ($contents_mask &&
                     IMP_Mime_Attachment::isAttachment($part)) {
                     $msgtext[$mime_id] = array(
-                        'text' => $this->_formatSummary($mime_id, $contents_mask, true)
+                        'text' => $this->_formatSummary($this->contents->getSummary($mime_id, $contents_mask), true)
                     );
                 }
                 continue;
@@ -618,7 +618,7 @@ protected function _getInlineOutput(array $options)
                 }
 
                 $part_text = ($contents_mask && empty($info['nosummary']))
-                    ? $this->_formatSummary($id, $contents_mask, !empty($info['attach']))
+                    ? $this->_formatSummary($this->contents->getSummary($id, $contents_mask), !empty($info['attach']))
                     : '';
 
                 if (empty($info['attach'])) {
@@ -714,17 +714,14 @@ protected function _getInlineOutput(array $options)
     /**
      * Prints out a MIME summary (in HTML).
      *
-     * @param string $id     The MIME ID.
-     * @param integer $mask  A bitmask indicating what summary information to
-     *                       return.
-     * @param boolean $atc   Is this an attachment?
+     * @param array $summary  Summary information.
+     * @param boolean $atc    Is this an attachment?
      *
      * @return string  The formatted summary string.
      */
-    protected function _formatSummary($id, $mask, $atc = false)
+    protected function _formatSummary($summary, $atc = false)
     {
         $display = array('icon', 'description', 'size', 'download', 'print');
-        $summary = $this->contents->getSummary($id, $mask);
         $tmp_summary = array();
 
         foreach ($display as $val) {