Bug #9767: Fix setting pointer if system tasks are also run

horde · Nov 1, 2011 · 4348780 · 4348780
1 parent 4be2fc8
commit 4348780
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/framework/LoginTasks/lib/Horde/LoginTasks/Tasklist.php b/framework/LoginTasks/lib/Horde/LoginTasks/Tasklist.php
@@ -89,12 +89,12 @@ public function addTask($task)
      */
     public function ready($advance = false)
     {
-        $tmp = array();
+        $stasks = $tasks = array();
 
         /* Always loop through system tasks first. */
         foreach ($this->_stasks as $key => $val) {
             if (!$val->skip()) {
-                $tmp[] = $val;
+                $stasks[] = $val;
                 unset($this->_stasks[$key]);
             }
         }
@@ -104,15 +104,15 @@ public function ready($advance = false)
             if ($v->needsDisplay() && ($k >= $this->_ptr)) {
                 break;
             }
-            $tmp[] = $v;
+            $tasks[] = $v;
         }
 
         if ($advance) {
-            $this->_tasks = array_slice($this->_tasks, count($tmp));
+            $this->_tasks = array_slice($this->_tasks, count($tasks));
             $this->_ptr = 0;
         }
 
-        return $tmp;
+        return array_merge($stasks, $tasks);
     }
 
     /**