From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Mon, 28 Jun 2010 22:37:24 +0000 (-0400)
Subject: fix factory usage
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=8a689c1349c1804facb996bc0706e7dd7543084f;p=horde.git

fix factory usage
---

diff --git a/jonah/lib/Injector/Binder/Driver.php b/jonah/lib/Injector/Binder/Driver.php
index 8b7cd3dea..14715283c 100644
--- a/jonah/lib/Injector/Binder/Driver.php
+++ b/jonah/lib/Injector/Binder/Driver.php
@@ -14,10 +14,10 @@ class Jonah_Injector_Binder_Driver Implements Horde_Injector_Binder
 {
     public function create(Horde_Injector $injector)
     {
-        $driver = $GLOBALS['conf']['news']['storage']['driver'];
+        $driver = Horde_String::ucfirst($GLOBALS['conf']['news']['storage']['driver']);
         $params = Horde::getDriverConfig(array('news', 'storage'), $driver);
 
-        $factory = new Jonah_Injector_Factory_Driver();
+        $factory = new Jonah_Injector_Factory_Driver($injector);
         return $factory->getDriver($driver, $params);
     }
 
diff --git a/jonah/lib/Injector/Factory/Driver.php b/jonah/lib/Injector/Factory/Driver.php
index cf621ea75..8da0afc88 100644
--- a/jonah/lib/Injector/Factory/Driver.php
+++ b/jonah/lib/Injector/Factory/Driver.php
@@ -49,7 +49,7 @@ class Jonah_Injector_Factory_Driver
     public function getDriver($driver, $params = array())
     {
         $driver = basename($driver);
-        $sig = md5(driver . serialize($params));
+        $sig = md5($driver . serialize($params));
         if (isset($this->_instances[$sig])) {
             return $this->_instances[$sig];
         }