remove statics for the inflector

diff --git a/framework/Rdo/lib/Horde/Rdo.php b/framework/Rdo/lib/Horde/Rdo.php
index ddcf41e..ec06938 100644 (file)
--- a/framework/Rdo/lib/Horde/Rdo.php
+++ b/framework/Rdo/lib/Horde/Rdo.php
@@ -40,34 +40,4 @@ class Horde_Rdo
      */
     const MANY_TO_MANY = 4;
 
-    /**
-     * Global inflector object.
-     *
-     * @var Horde_Support_Inflector
-     */
-    protected static $_inflector;
-
-    /**
-     * Get the global inflector object.
-     *
-     * @return Horde_Support_Inflector
-     */
-    public static function getInflector()
-    {
-        if (!self::$_inflector) {
-            self::$_inflector = new Horde_Support_Inflector;
-        }
-        return self::$_inflector;
-    }
-
-    /**
-     * Set a custom global inflector.
-     *
-     * @param Horde_Support_Inflector $inflector
-     */
-    public static function setInflector($inflector)
-    {
-        self::$_inflector = $inflector;
-    }
-
 }

diff --git a/framework/Rdo/lib/Horde/Rdo/Mapper.php b/framework/Rdo/lib/Horde/Rdo/Mapper.php
index e386c2e..dd9963a 100644 (file)
--- a/framework/Rdo/lib/Horde/Rdo/Mapper.php
+++ b/framework/Rdo/lib/Horde/Rdo/Mapper.php
@@ -123,7 +123,8 @@ abstract class Horde_Rdo_Mapper implements Countable
             return $this->adapter;
 
         case 'inflector':
-            return Horde_Rdo::getInflector();
+            $this->inflector = new Horde_Support_Inflector();
+            return $this->inflector;
 
         case 'table':
             $this->table = !empty($this->_table) ? $this->_table : $this->mapperToTable();