From 578c5c38404858be8c84ae4d6b3f612fdcd35923 Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <wrobel@temple.(none)>
Date: Tue, 9 Mar 2010 17:39:56 +0100
Subject: [PATCH] Only redirect to the final URL once we are really finished
 with the task list.

---
 framework/LoginTasks/lib/Horde/LoginTasks.php               |  4 ++--
 .../LoginTasks/test/Horde/LoginTasks/LoginTasksTest.php     | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/framework/LoginTasks/lib/Horde/LoginTasks.php b/framework/LoginTasks/lib/Horde/LoginTasks.php
index e62af95ef..858132ebe 100644
--- a/framework/LoginTasks/lib/Horde/LoginTasks.php
+++ b/framework/LoginTasks/lib/Horde/LoginTasks.php
@@ -241,13 +241,13 @@ class Horde_LoginTasks
              * object in the session, while still indicating we have
              * completed the login tasks for this application. */
             $this->_tasklist = true;
+
+            return $this->_backend->redirect($tasklist_target);
         }
 
         if (!$processed && $need_display) {
             $this->_tasklist->target = $url;
             return $this->_backend->redirect($this->getLoginTasksUrl());
-        } elseif ($processed && !$need_display) {
-            return $this->_backend->redirect($tasklist_target);
         }
     }
 
diff --git a/framework/LoginTasks/test/Horde/LoginTasks/LoginTasksTest.php b/framework/LoginTasks/test/Horde/LoginTasks/LoginTasksTest.php
index 6da544850..1107e1c1c 100644
--- a/framework/LoginTasks/test/Horde/LoginTasks/LoginTasksTest.php
+++ b/framework/LoginTasks/test/Horde/LoginTasks/LoginTasksTest.php
@@ -429,7 +429,7 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
 
     public function testConfirmSeriesDisplay()
     {
-        $this->markTestIncomplete();
+        //$this->markTestIncomplete();
         Horde_LoginTasks_Stub_Task::$executed = array();
         $tasks = $this->_getLoginTasks(
             array(
@@ -468,8 +468,7 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
         );
         $_POST['logintasks_confirm_0'] = true;
         $_POST['logintasks_confirm_1'] = true;
-        $this->assertEquals(
-            'redirect',
+        $this->assertNull(
             $tasks->runTasks(true)
         );
         $this->assertEquals(
@@ -480,13 +479,15 @@ class Horde_LoginTasks_LoginTasksTest extends PHPUnit_Framework_TestCase
             ),
             Horde_LoginTasks_Stub_Task::$executed
         );
-        $this->assertContains(
-            'http:///services/logintasks.php?app=test',
-            (string) $tasks->runTasks(false)
+        $_POST = array();
+        $this->assertNull(
+            $tasks->runTasks(false)
         );
         $this->assertEquals(
             array(
                 'Horde_LoginTasks_Stub_ConfirmNo',
+                'Horde_LoginTasks_Stub_Confirm',
+                'Horde_LoginTasks_Stub_Task',
             ),
             Horde_LoginTasks_Stub_Task::$executed
         );
-- 
2.11.0