use args consistently. needs to be refactored to use a dependency injector eventually

diff --git a/content/lib/Objects/Manager.php b/content/lib/Objects/Manager.php
index 7dc466f..d9225e9 100644 (file)
--- a/content/lib/Objects/Manager.php
+++ b/content/lib/Objects/Manager.php
@@ -45,13 +45,17 @@ class Content_Objects_Manager
      */
     public function __construct($context = array())
     {
+        if (!empty($context['dbAdapter'])) {
+            $this->_db = $context['dbAdapter'];
+        }
+
         if (!empty($params['typeManager'])) {
             $this->_typeManager = $params['typeManager'];
         }
     }
 
     /**
-     *
+     * Set the database connection.
      *
      * @param Horde_Db $db  The database connection
      */

diff --git a/content/lib/Types/Manager.php b/content/lib/Types/Manager.php
index 0cd26ff..35d379a 100644 (file)
--- a/content/lib/Types/Manager.php
+++ b/content/lib/Types/Manager.php
@@ -34,7 +34,9 @@ class Content_Types_Manager
 
     public function __construct($context = array())
     {
-        $this->_db = $adapter;
+        if (!empty($context['dbAdapter'])) {
+            $this->_db = $context['dbAdapter'];
+        }
     }
 
     /**

diff --git a/content/lib/Users/Manager.php b/content/lib/Users/Manager.php
index cc295e4..638e28b 100644 (file)
--- a/content/lib/Users/Manager.php
+++ b/content/lib/Users/Manager.php
@@ -32,9 +32,11 @@ class Content_Users_Manager
         'users' => 'rampage_users',
     );
 
-    public function __construct($adapter, $params = array())
+    public function __construct($context = array())
     {
-        $this->_db = $adapter;
+        if (!empty($context['dbAdapter'])) {
+            $this->_db = $context['dbAdapter'];
+        }
     }
 
     /**