addPollList() isn't needed for nav_poll_all installations

horde · Feb 11, 2014 · 1f113e7 · 1f113e7
1 parent d2d8d09
commit 1f113e7
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/imp/lib/Ftree/Prefs/Poll.php b/imp/lib/Ftree/Prefs/Poll.php
@@ -97,20 +97,19 @@ public function getPollList($sort = false)
      */
     public function addPollList($id)
     {
-        if ($this->locked && ($this->_data !== true)) {
+        if ($this->locked) {
             return;
         }
 
         foreach ((is_array($id) ? $id : array($id)) as $val) {
             if (($elt = $this->_ftree[$val]) &&
+                !$elt->polled &&
                 !$elt->nonimap &&
                 !$elt->container) {
-                if (($this->_data !== true) && !$elt->polled) {
-                    if (!$elt->subscribed) {
-                        $elt->subscribed = true;
-                    }
-                    $this[$elt] = true;
+                if (!$elt->subscribed) {
+                    $elt->subscribed = true;
                 }
+                $this[$elt] = true;
                 $elt->polled = true;
             }
         }