URL for unconfirmed accounts fixed, method call of non-object fixed

diff --git a/application/ship-simu/config.php b/application/ship-simu/config.php
index 6210fb067026fdd727fdf3ad0be8d5ca5e2911e8..26e173d6b65441b91f80bb0f8e6f3f5d15e64dd2 100644 (file)
--- 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 1143d22136a2772fa8ddb6429d850e95e4abe252..ea647db9697282a6026d7e3318f6e158beb1871c 100644 (file)
--- 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();