Don't block images in HTML data when viewing in thread mode

horde · Oct 9, 2013 · a635b37 · a635b37
1 parent bab3224
commit a635b37
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/imp/lib/Basic/Thread.php b/imp/lib/Basic/Thread.php
@@ -71,6 +71,9 @@ protected function _init()
         $query = new Horde_Imap_Client_Fetch_Query();
         $query->envelope();
 
+        /* Force images to show in HTML data. */
+        $injector->getInstance('IMP_Images')->alwaysShow = true;
+
         foreach ($imp_indices as $ob) {
             $fetch_res = $imp_imap->fetch($ob->mbox, $query, array(
                 'ids' => $imp_imap->getIdsOb($ob->uids)

diff --git a/imp/lib/Images.php b/imp/lib/Images.php
@@ -22,6 +22,13 @@
  */
 class IMP_Images
 {
+    /**
+     * Always show inline images?
+     *
+     * @var boolean
+     */
+    public $alwaysShow = false;
+
     /**
      * Show inline images in messages?
      *
@@ -34,7 +41,7 @@ public function showInlineImage(IMP_Contents $contents)
     {
         global $injector, $prefs, $registry;
 
-        if (!$prefs->getValue('image_replacement')) {
+        if ($this->alwaysShow || !$prefs->getValue('image_replacement')) {
             return true;
         }