From: Jan Schneider Date: Tue, 28 Dec 2010 13:09:57 +0000 (+0100) Subject: Simplify X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=228817a12ef1b8835a7eceb9a4410b5dae94b492;p=horde.git Simplify --- diff --git a/framework/Core/lib/Horde/Core/Factory/ShareBase.php b/framework/Core/lib/Horde/Core/Factory/ShareBase.php index 68892988a..0a3fb210b 100644 --- a/framework/Core/lib/Horde/Core/Factory/ShareBase.php +++ b/framework/Core/lib/Horde/Core/Factory/ShareBase.php @@ -43,15 +43,14 @@ class Horde_Core_Factory_ShareBase $ob = new $class($app, $GLOBALS['registry']->getAuth(), $GLOBALS['injector']->getInstance('Horde_Perms'), $GLOBALS['injector']->getInstance('Horde_Group')); $cb = new Horde_Core_Share_FactoryCallback($app, $driver); $ob->setShareCallback(array($cb, 'create')); + $ob->setLogger($GLOBALS['injector']->getInstance('Horde_Log_Logger')); if (!empty($GLOBALS['conf']['share']['cache'])) { $cache_sig = 'horde_share/' . $app . '/' . $driver; $listCache = $GLOBALS['session']->retrieve($cache_sig); $ob->setListCache($listCache); - } - $ob->setLogger($GLOBALS['injector']->getInstance('Horde_Log_Logger')); - if (!empty($GLOBALS['conf']['share']['cache'])) { register_shutdown_function(array($this, 'shutdown'), $cache_sig, $ob); } + $this->_instances[$sig] = $ob; return $ob;