Use injector originally passed to the factory

diff --git a/framework/Core/lib/Horde/Core/Factory/KolabStorage.php b/framework/Core/lib/Horde/Core/Factory/KolabStorage.php
index 1dd8b51..2cf5fac 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/KolabStorage.php
+++ b/framework/Core/lib/Horde/Core/Factory/KolabStorage.php
@@ -105,7 +105,7 @@ class Horde_Core_Factory_KolabStorage
 
         $master = new Horde_Kolab_Storage_Driver_Imap(
             $imap,
-            $GLOBALS['injector']->getInstance('Horde_Group')
+            $this->_injector->getInstance('Horde_Group')
         );
 
         return new Horde_Kolab_Storage(

diff --git a/framework/Core/lib/Horde/Core/Factory/Ldap.php b/framework/Core/lib/Horde/Core/Factory/Ldap.php
index aab4c57..61c3013 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/Ldap.php
+++ b/framework/Core/lib/Horde/Core/Factory/Ldap.php
@@ -81,7 +81,7 @@ class Horde_Core_Factory_Ldap
         if (!isset($config['user'])) {
             $config['user'] = $config;
         }
-        $config['cache'] = $GLOBALS['injector']->getInstance('Horde_Cache');
+        $config['cache'] = $this->_injector->getInstance('Horde_Cache');
 
         try {
             $this->_instances[$sig] = new Horde_Ldap($config);

diff --git a/framework/Core/lib/Horde/Core/Factory/Twitter.php b/framework/Core/lib/Horde/Core/Factory/Twitter.php
index 15b87a9..644c5bc 100644 (file)
--- a/framework/Core/lib/Horde/Core/Factory/Twitter.php
+++ b/framework/Core/lib/Horde/Core/Factory/Twitter.php
@@ -35,11 +35,11 @@ class Horde_Core_Factory_Twitter
 
             //$twitter->setCache($injector->getInstance('Horde_Cache'));
             $twitter->setLogger($injector->getInstance('Horde_Log_Logger'));
-            $twitter->setHttpClient($GLOBALS['injector']->getInstance('Horde_Http_Client')->getClient());
+            $twitter->setHttpClient($injector->getInstance('Horde_Http_Client')->getClient());
 
             return $twitter;
         } else {
             throw new Horde_Service_Twitter_Exception(_("No OAuth Key or Secret found for the Twitter API"));
         }
     }
-}
\ No newline at end of file
+}