Continued:

[core.git] / framework / main / classes / commands / html / class_HtmlLoginAreaCommand.php

diff --git a/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php b/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php
index 6ec51ebb0146c87ac12b94a3c8825a9a912ce578..95fac58a1918ed5ec2060b743fff40bd0943c438 100644 (file)
--- a/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php
+++ b/framework/main/classes/commands/html/class_HtmlLoginAreaCommand.php
@@ -9,6 +9,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand;
 use Org\Mxchange\CoreFramework\Command\Commandable;
 use Org\Mxchange\CoreFramework\Controller\Controller;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper;
 use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver;
@@ -100,7 +101,7 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable {
                }
 
                // Get the application instance
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                // Assign base URL
                $this->getTemplateInstance()->assignConfigVariable('base_url');
@@ -174,11 +175,8 @@ class HtmlLoginAreaCommand extends BaseCommand implements Commandable {
         * @return      void
         */
        public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) {
-               // Get registry
-               $registryInstance = GenericRegistry::getRegistry();
-
                // Get our application instance from the registry
-               $applicationInstance = $registryInstance->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                // Default action is the one from configuration
                $this->actionName = StringUtils::convertDashesToUnderscores($applicationInstance->getAppShortName()) . '_login_' . FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('login_default_action');