X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fcommands%2Fhtml%2Fclass_HtmlLoginAreaCommand.php;fp=framework%2Fmain%2Fclasses%2Fcommands%2Fhtml%2Fclass_HtmlLoginAreaCommand.php;h=a7aad82e316d7a0256f3ecbf468650f82792c38d;hp=3437798d78fe2c781269c98ebd356a3bd3743cb7;hb=2b4f4b88ec5f9d385110e800494c680e164b5a36;hpb=9a62415e59d249f13512f41181f4406680e3d5fd diff --git a/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php b/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php index 3437798d..a7aad82e 100644 --- a/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php +++ b/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php @@ -107,7 +107,7 @@ class HtmlLoginAreaCommand 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(); @@ -196,11 +196,8 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable { $this->actionName = self::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();