sync

diff --git a/DB/DataObject.php b/DB/DataObject.php
index a15c2eb..7e15b65 100644 (file)
--- a/DB/DataObject.php
+++ b/DB/DataObject.php
@@ -2090,7 +2090,14 @@ class DB_DataObject extends DB_DataObject_Overload
         
         return $table;
     }
-    
+    /**
+     * Wrapper for migration to PDO DataObjects
+     */
+    function databaseNickname()
+    {
+        return $this->database();
+    }
+  
     /**
      * Return or assign the name of the current database
      *
@@ -2109,6 +2116,16 @@ class DB_DataObject extends DB_DataObject_Overload
         
         return $this->_database;
     }
+    
+    
+    /**
+     * Wrapper for migration to PDO DataObjects
+     */
+  
+    function tableColumns()
+    {
+        return call_user_func_array(array($this,'table'), func_get_args());
+    }
   
     /**
      * get/set an associative array of table columns

diff --git a/HTML/FlexyFramework2.php b/HTML/FlexyFramework2.php
index 8f3ff26..5fba629 100644 (file)
--- a/HTML/FlexyFramework2.php
+++ b/HTML/FlexyFramework2.php
@@ -451,6 +451,7 @@ class HTML_FlexyFramework2 {
         // 
         $this->PDO_DataObject['schema_location']   = $iniCache;
         PDO_DataObject::config($this->PDO_DataObject);
+        
         // we now have the configuration file name..
          
         if (!file_exists($iniCache) || empty( $this->dataObjectsCacheExpires)) {