From bafa063d644dfb9ee4803c4e581e419f55cea6c5 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 6 Oct 2010 12:58:21 -0600
Subject: [PATCH] Use injector originally passed to the factory

---
 framework/Core/lib/Horde/Core/Factory/KolabStorage.php | 2 +-
 framework/Core/lib/Horde/Core/Factory/Ldap.php         | 2 +-
 framework/Core/lib/Horde/Core/Factory/Twitter.php      | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/framework/Core/lib/Horde/Core/Factory/KolabStorage.php b/framework/Core/lib/Horde/Core/Factory/KolabStorage.php
index 1dd8b5177..2cf5facd7 100644
--- 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 aab4c57d4..61c301361 100644
--- 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 15b87a926..644c5bcde 100644
--- 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
+}
-- 
2.11.0