Fix loading quota on initial dynamic mailbox request

horde · Sep 3, 2014 · c62f374 · c62f374
1 parent 6577d19
commit c62f374
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/imp/lib/Ajax/Queue.php b/imp/lib/Ajax/Queue.php
@@ -529,9 +529,13 @@ public function poll($mboxes, $explicit = false)
     public function quota($mailbox, $force = true)
     {
         if (!is_null($this->_quota)) {
-            $this->_quota = is_null($mailbox)
-                ? null
-                : array($mailbox, $force);
+            if (is_null($mailbox)) {
+                /* Disable quota output entirely. */
+                $this->_quota = null;
+            } elseif (!is_array($this->_quota) || !$this->_quota[1]) {
+                /* Don't change a previously issued force quota request. */
+                $this->_quota = array($mailbox, $force);
+            }
         }
     }