Fix toggling hide deleted

horde · Dec 22, 2014 · 179540b · 179540b
1 parent bf88324
commit 179540b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/imp/lib/Ajax/Application/Handler/Common.php b/imp/lib/Ajax/Application/Handler/Common.php
@@ -104,10 +104,6 @@ public function viewPort()
             try {
                 $vp = $this->_base->viewPortData($changed);
                 $result = true;
-
-                if (isset($vp_vars->delhide)) {
-                    $vp->metadata_reset = 1;
-                }
             } catch (Exception $e) {
                 $vp = new IMP_Ajax_Application_Viewport_Error($this->_base->indices->mailbox);
             }

diff --git a/imp/lib/Ajax/Application/ListMessages.php b/imp/lib/Ajax/Application/ListMessages.php
@@ -163,11 +163,10 @@ public function listMessages($args)
         }
 
         /* Mail-specific viewport information. */
-        if (($args['initial'] ||
-             $args['delhide'] ||
-             !is_null($args['sortby'])) &&
-            $mbox->hideDeletedMsgs(true)) {
-            $result->setMetadata('delhide', 1);
+        if ($args['initial'] ||
+            (isset($args['delhide']) && !is_null($args['delhide'])) ||
+            !is_null($args['sortby']))  {
+            $result->setMetadata('delhide', $mbox->hideDeletedMsgs(true));
         }
         if ($args['initial'] ||
             !is_null($args['sortby']) ||

diff --git a/imp/lib/Mailbox.php b/imp/lib/Mailbox.php
@@ -1472,6 +1472,8 @@ static public function prefTo($mbox)
      */
     protected function _getCacheID($date = false)
     {
+        global $prefs;
+
         $date = $date
             ? 'D' . date('z')
             : '';
@@ -1481,7 +1483,11 @@ protected function _getCacheID($date = false)
         }
 
         $sortpref = $this->getSort(true);
-        $addl = array($sortpref->sortby, $sortpref->sortdir);
+        $addl = array(
+            $sortpref->sortby,
+            $sortpref->sortdir,
+            intval($prefs->getValue('delhide'))
+        );
         if ($date) {
             $addl[] = $date;
         }