From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 19 May 2010 03:45:34 +0000 (-0600)
Subject: Memcache SessionHandler instantiation fixes
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=5fc6a8f82ff20a1845771621ff5b6dbeb4d680e6;p=horde.git

Memcache SessionHandler instantiation fixes
---

diff --git a/framework/Core/lib/Horde/Core/Binder/SessionHandler.php b/framework/Core/lib/Horde/Core/Binder/SessionHandler.php
index fd17817a3..fe49be14c 100644
--- a/framework/Core/lib/Horde/Core/Binder/SessionHandler.php
+++ b/framework/Core/lib/Horde/Core/Binder/SessionHandler.php
@@ -21,6 +21,8 @@ class Horde_Core_Binder_SessionHandler implements Horde_Injector_Binder
 
         if (strcasecmp($driver, 'Sql') === 0) {
             $params['db'] = $injector->getInstance('Horde_Db_Adapter_Base');
+        } elseif (strcasecmp($driver, 'Memcache') === 0) {
+            $params['memcache'] = $injector->getInstance('Horde_Memcache');
         }
 
         $logger = $injector->getInstance('Horde_Log_Logger');
diff --git a/framework/SessionHandler/lib/Horde/SessionHandler/Memcache.php b/framework/SessionHandler/lib/Horde/SessionHandler/Memcache.php
index ec31380cd..f48dff97d 100644
--- a/framework/SessionHandler/lib/Horde/SessionHandler/Memcache.php
+++ b/framework/SessionHandler/lib/Horde/SessionHandler/Memcache.php
@@ -58,7 +58,7 @@ class Horde_SessionHandler_Memcache extends Horde_SessionHandler_Driver
     public function __construct(array $params = array())
     {
         if (empty($params['memcache'])) {
-            throw InvalidArgumentException('Missing memcache argument.');
+            throw new InvalidArgumentException('Missing memcache argument.');
         }
 
         $this->_memcache = $params['memcache'];