From 6f3661268c0a5fbef551fceb3b9ffaba8a97a98c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 20 Jun 2008 21:34:15 +0000 Subject: [PATCH] URL for unconfirmed accounts fixed, method call of non-object fixed --- application/ship-simu/config.php | 2 +- .../main/commands/web/class_WebLoginAreaCommand.php | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/application/ship-simu/config.php b/application/ship-simu/config.php index 6210fb0..26e173d 100644 --- a/application/ship-simu/config.php +++ b/application/ship-simu/config.php @@ -101,7 +101,7 @@ $cfg->setConfigEntry('login_failed_url', "index.php?app=ship-simu&page=login_fai $cfg->setConfigEntry('logout_done_url', "index.php?app=ship-simu&page=logout_done"); // CFG: LOGIN-USER-STATUS-URL -$cfg->setConfigEntry('login_user_status_url', "index.php?app=ship-simu&page=login_status_problem"); +$cfg->setConfigEntry('login_user_status_url', "index.php?app=ship-simu&page=login_area&action=login_status_problem"); // CFG: LOGIN-DEFAULT-ACTION $cfg->setConfigEntry('login_default_action', "welcome"); diff --git a/inc/classes/main/commands/web/class_WebLoginAreaCommand.php b/inc/classes/main/commands/web/class_WebLoginAreaCommand.php index 1143d22..ea647db 100644 --- a/inc/classes/main/commands/web/class_WebLoginAreaCommand.php +++ b/inc/classes/main/commands/web/class_WebLoginAreaCommand.php @@ -86,8 +86,11 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable { // Get the action instance from registry $actionInstance = Registry::getRegistry()->getInstance('action'); - // Execute the action (shall not output anything, see below why) - $actionInstance->execute($requestInstance, $responseInstance); + // Do we have an action here? + if ($actionInstance instanceof PerformableAction) { + // Execute the action (shall not output anything, see below why) + $actionInstance->execute($requestInstance, $responseInstance); + } // END - if // Get the application instance $appInstance = $this->getResolverInstance()->getApplicationInstance(); -- 2.39.5