Continued:

[city.git] / application / city / classes / login / helper / class_CityLoginHelper.php

diff --git a/application/city/classes/login/helper/class_CityLoginHelper.php b/application/city/classes/login/helper/class_CityLoginHelper.php
index 632280a3ea382992e9ce9b1a4b26f27c4196cc08..b33105ba7dbbeb8788f8747a5a214efe414af762 100644 (file)
--- a/application/city/classes/login/helper/class_CityLoginHelper.php
+++ b/application/city/classes/login/helper/class_CityLoginHelper.php
@@ -5,7 +5,7 @@ namespace Org\Mxchange\City\Helper\Login;
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 
 /**
@@ -70,7 +70,7 @@ class CityLoginHelper extends BaseLoginHelper implements HelpableLogin {
                $helperInstance = new CityLoginHelper();
 
                // Get a user instance from registry
-               $userInstance = Registry::getRegistry()->getInstance('user');
+               $userInstance = GenericRegistry::getRegistry()->getInstance('user');
 
                // Is this instance valid?
                if (!$userInstance instanceof ManageableAccount) {
@@ -81,9 +81,6 @@ class CityLoginHelper extends BaseLoginHelper implements HelpableLogin {
                // Set default login method from config
                $helperInstance->setDefaultAuthMethod();
 
-               // Set request instance
-               $helperInstance->setRequestInstance($requestInstance);
-
                // Return the prepared instance
                return $helperInstance;
        }
@@ -115,6 +112,6 @@ class CityLoginHelper extends BaseLoginHelper implements HelpableLogin {
                $loginInstance->setPasswordAuth(FrameworkBootstrap::getRequestInstance()->getRequestElement('pass_hash'));
 
                // Remember this login instance for later usage
-               Registry::getRegistry()->addInstance('login', $loginInstance);
+               GenericRegistry::getRegistry()->addInstance('login', $loginInstance);
        }
 }