From 20812e0d711b450fed15dcf66ac8beb5d84897fe Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sat, 18 Apr 2015 12:27:47 +0200 Subject: [PATCH] Nope, this way ... :-( MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../main/factories/login/class_LoginFactory.php | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/inc/classes/main/factories/login/class_LoginFactory.php b/inc/classes/main/factories/login/class_LoginFactory.php index 0f271993..63db93d5 100644 --- a/inc/classes/main/factories/login/class_LoginFactory.php +++ b/inc/classes/main/factories/login/class_LoginFactory.php @@ -49,17 +49,11 @@ class LoginFactory extends ObjectFactory { } else { // Probe on member instance try { - // Get class name - $className = FrameworkConfiguration::getSelfInstance()->getConfigEntry('user_login_class'); - - // Try to instance it - $loginInstance = call_user_func_array(array($className, 'createMemberByRequest'), array($requestInstance)); + // Try to instance member login class + $loginInstance = self::createObjectByConfiguredName('user_login_class', array($requestInstance)); } catch (UnexpectedGuestAccountException $e) { - // Then try it with guest account - $className = FrameworkConfiguration::getSelfInstance()->getConfigEntry('guest_login_class'); - - // Try to instance it - $loginInstance = call_user_func_array(array($className, 'createGuestByRequest'), array($requestInstance)); + // Then try guest login + $loginInstance = self::createObjectByConfiguredName('guest_login_class', array($requestInstance)); } // Set the instance in registry for further use -- 2.30.2