Merge branch 'master' of ssh://dev.horde.org/horde/git/horde

horde · Sep 21, 2016 · 721f730 · 721f730
2 parents 3bc2327 + 2f54699
commit 721f730
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/imp/lib/Ajax/Application/Handler/ImageUnblock.php b/imp/lib/Ajax/Application/Handler/ImageUnblock.php
@@ -33,14 +33,18 @@ public function imageUnblockAdd()
     {
         global $injector, $notification;
 
-        $h = $injector->getInstance('IMP_Factory_Contents')->create(new IMP_Indices_Mailbox($this->vars))->getHeader();
+        $indices = new IMP_Indices_Mailbox($this->vars);
+        $h = $injector->getInstance('IMP_Factory_Contents')
+            ->create($indices)
+            ->getHeader();
         if (!($f = $h['from'])) {
              return true;
         }
 
         $address = $f->getAddressList(true)->first()->bare_address;
 
         if ($injector->getInstance('IMP_Prefs_Special_ImageReplacement')->addSafeAddrList($address)) {
+            $this->_base->queue->message($indices);
             $notification->push(sprintf(_("Always showing images in messages sent by %s."), $address), 'horde.success');
         }
 

diff --git a/imp/lib/Indices/Mailbox.php b/imp/lib/Indices/Mailbox.php
@@ -86,7 +86,7 @@ public function __construct()
         }
 
         if (!isset($this->buids)) {
-            $this->buids = new IMP_Indices();
+            $this->buids = new IMP_Indices($this->_indices);
         }
 
         if (!isset($this->mailbox)) {