Skip to content

Commit

Permalink
Revert iteration changes
Browse files Browse the repository at this point in the history
This broke parsing embedded parts.

Revert "Keep the typos coming"
This reverts commit 39c27c4.

Revert "Fix typo"
This reverts commit 6a2f78a.

Revert "Fix iteration through certain MIME parts with deeply embedded subparts"
This reverts commit cd41ccc.

This has been tracked down to a very obscure issue in the new MIME part
iteration code.
  • Loading branch information
slusarz committed Apr 24, 2015
1 parent 9990bdd commit d00d1cd
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions imp/lib/Contents/Message.php
Expand Up @@ -561,16 +561,10 @@ protected function _getInlineOutput(array $options)
: null;
$show_parts = $prefs->getValue('parts_display');

/* Need to iterate through entire part list first, since render
* methods may break iteration when they iterate through subparts. */
$p_list = array();
foreach ($this->contents->getMIMEMessage()->partIterator() as $val) {
$mime_id = $val->getMimeId();
foreach ($this->contents->getMIMEMessage()->partIterator() as $part) {
$mime_id = $part->getMimeId();
$i[] = $mime_id;
$p_list[$mime_id] = $val;
}

foreach ($p_list as $mime_id => $part) {
if (isset($display_ids[$mime_id]) ||
isset($atc_parts[$mime_id])) {
continue;
Expand Down

0 comments on commit d00d1cd

Please sign in to comment.