From 73bb6dde97c3c43a2f42b9c2299d2acc40284ec0 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Tue, 3 Aug 2010 17:04:12 -0600 Subject: [PATCH] This method does not require this parameter --- framework/Core/lib/Horde/Core/LoginTasks/Backend/Horde.php | 10 ++++------ framework/LoginTasks/lib/Horde/LoginTasks.php | 2 +- framework/LoginTasks/lib/Horde/LoginTasks/Backend.php | 4 +--- framework/LoginTasks/test/Horde/LoginTasks/Stubs.php | 2 +- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/framework/Core/lib/Horde/Core/LoginTasks/Backend/Horde.php b/framework/Core/lib/Horde/Core/LoginTasks/Backend/Horde.php index 4fd943d42..d37028c82 100644 --- a/framework/Core/lib/Horde/Core/LoginTasks/Backend/Horde.php +++ b/framework/Core/lib/Horde/Core/LoginTasks/Backend/Horde.php @@ -158,22 +158,20 @@ class Horde_Core_LoginTasks_Backend_Horde extends Horde_LoginTasks_Backend /** * Redirect to the given URL. * - * @param string $url The URL to redirect to. + * @param Horde_Url|string $url The URL to redirect to. */ public function redirect($url) { - header('Location: ' . $url); - exit; + $url = new Horde_url($url); + $url->redirect(); } /** * Return the URL of the login tasks view. * - * @param array $tasks The tasks to be displayed next. - * * @return string The URL of the login tasks view. */ - public function getLoginTasksUrl(array $tasks = null) + public function getLoginTasksUrl() { return Horde::getServiceLink('logintasks', $this->_app); } diff --git a/framework/LoginTasks/lib/Horde/LoginTasks.php b/framework/LoginTasks/lib/Horde/LoginTasks.php index 79e09329d..90ae0f709 100644 --- a/framework/LoginTasks/lib/Horde/LoginTasks.php +++ b/framework/LoginTasks/lib/Horde/LoginTasks.php @@ -240,7 +240,7 @@ class Horde_LoginTasks */ public function getLoginTasksUrl() { - return $this->_backend->getLoginTasksUrl($this->_tasklist->needDisplay()); + return $this->_backend->getLoginTasksUrl(); } /** diff --git a/framework/LoginTasks/lib/Horde/LoginTasks/Backend.php b/framework/LoginTasks/lib/Horde/LoginTasks/Backend.php index 363a3bc31..4bf49bc2b 100644 --- a/framework/LoginTasks/lib/Horde/LoginTasks/Backend.php +++ b/framework/LoginTasks/lib/Horde/LoginTasks/Backend.php @@ -86,9 +86,7 @@ abstract class Horde_LoginTasks_Backend /** * Return the URL of the login tasks view. * - * @param array $tasks The tasks to be displayed next. - * * @return string The URL of the login tasks view */ - abstract public function getLoginTasksUrl(array $tasks = null); + abstract public function getLoginTasksUrl(); } diff --git a/framework/LoginTasks/test/Horde/LoginTasks/Stubs.php b/framework/LoginTasks/test/Horde/LoginTasks/Stubs.php index 013d32102..b4f8d9f12 100644 --- a/framework/LoginTasks/test/Horde/LoginTasks/Stubs.php +++ b/framework/LoginTasks/test/Horde/LoginTasks/Stubs.php @@ -64,7 +64,7 @@ class Horde_LoginTasks_Stub_Backend extends Horde_LoginTasks_Backend return $url; } - public function getLoginTasksUrl(array $tasks = null) + public function getLoginTasksUrl() { return 'URL'; } -- 2.11.0