Templates moved from core to add directory

[admin.git] / application / admin / main / login / class_AdminUserLogin.php

diff --git a/application/admin/main/login/class_AdminUserLogin.php b/application/admin/main/login/class_AdminUserLogin.php
index a4187a5e843b0ae9a0796f4dcc481b1f882775a7..423297eb9f8c318ed6f4fd227ddb4d9df813c44d 100644 (file)
--- a/application/admin/main/login/class_AdminUserLogin.php
+++ b/application/admin/main/login/class_AdminUserLogin.php
@@ -73,20 +73,14 @@ class AdminUserLogin extends BaseFrameworkSystem implements LoginableUser {
                $method = null;
                $data = "";
 
-               // Get a instance of the registry
-               $userInstance = Registry::getRegistry()->getInstance('user');
+               // Get member class
+               $userClass = $this->getConfigInstance()->readConfig('user_class');
 
-               // Is there an instance?
-               if (is_null($userInstance)) {
-                       // Get member class
-                       $userClass = $this->getConfigInstance()->readConfig('user_class');
+               // Get a user instance
+               $userInstance = call_user_func_array(array($userClass, 'createMemberByRequest'), array($requestInstance));
 
-                       // Get a user instance
-                       $userInstance = call_user_func_array(array($userClass, 'createMemberByRequest'), array($requestInstance));
-
-                       // Remember this new instance in registry
-                       Registry::getRegistry()->addInstance($userInstance);
-               } // END - if
+               // Remember this new instance in registry
+               Registry::getRegistry()->addInstance('user', $userInstance);
 
                // Is the password correct?
                if ($userInstance->ifPasswordHashMatches($requestInstance) === false) {