Continued:

[city.git] / application / city / classes / commands / html / class_CityHtmlLoginAreaCommand.php

diff --git a/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php
index 4197b4d39fac4eb8c224699679c43cc7cda76d4c..7344cb3feebec34bfac2c17c6dae766e7a3c4119 100644 (file)
--- a/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php
+++ b/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php
@@ -103,7 +103,7 @@ class CityHtmlLoginAreaCommand extends BaseCommand implements Commandable {
                $templateInstance->assignConfigVariable('base_url');
 
                // Assign all the application's data with template variables
-               $templateInstance->assignApplicationData($applicationInstance);
+               $templateInstance->assignApplicationData();
 
                // Load the master template
                $masterTemplate = $applicationInstance->buildMasterTemplateName();
@@ -192,11 +192,8 @@ class CityHtmlLoginAreaCommand extends BaseCommand implements Commandable {
                        $this->actionName = $this->convertDashesToUnderscores($applicationInstance->getAppShortName()) . '_login_' . $actReq;
                } // END - if
 
-               // Get application instance
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
-
                // Get a resolver
-               $actionResolver = HtmlActionResolver::createHtmlActionResolver($this->actionName, $applicationInstance);
+               $actionResolver = HtmlActionResolver::createHtmlActionResolver($this->actionName);
 
                // Resolve the action
                $actionInstance = $actionResolver->resolveAction();
@@ -207,4 +204,5 @@ class CityHtmlLoginAreaCommand extends BaseCommand implements Commandable {
                // Remember this action in registry
                GenericRegistry::getRegistry()->addInstance('action', $actionInstance);
        }
+
 }