From 3dbc711eaef366ac743945d1957293e6240facea Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Thu, 18 Mar 2010 17:16:25 +0100 Subject: [PATCH] Fix setting logger. --- framework/Core/lib/Horde/Core/Binder/Token.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/framework/Core/lib/Horde/Core/Binder/Token.php b/framework/Core/lib/Horde/Core/Binder/Token.php index 6043e6a4b..9a1756e7c 100644 --- a/framework/Core/lib/Horde/Core/Binder/Token.php +++ b/framework/Core/lib/Horde/Core/Binder/Token.php @@ -3,12 +3,14 @@ class Horde_Core_Binder_Token implements Horde_Injector_Binder { public function create(Horde_Injector $injector) { - $token = isset($GLOBALS['conf']['token']) - ? Horde_Token::singleton($GLOBALS['conf']['token']['driver'], Horde::getDriverConfig('token', $GLOBALS['conf']['token']['driver'])) - : Horde_Token::singleton('file'); - $token->setLogger($injector->getInstance('Horde_Log_Logger')); - - return $token; + $driver = isset($GLOBALS['conf']['token']) + ? $GLOBALS['conf']['token']['driver'] + : 'file'; + $params = isset($GLOBALS['conf']['token']) + ? Horde::getDriverConfig('token', $GLOBALS['conf']['token']['driver']) + : array(); + $params['logger'] = $injector->getInstance('Horde_Log_Logger'); + return Horde_Token::singleton($driver, $params); } public function equals(Horde_Injector_Binder $binder) -- 2.11.0