[pLog-svn] r3757 - in plog/trunk: . class/database/pdb

oscar at devel.lifetype.net oscar at devel.lifetype.net
Thu Jul 20 06:42:35 GMT 2006


Author: oscar
Date: 2006-07-20 06:42:35 +0000 (Thu, 20 Jul 2006)
New Revision: 3757

Modified:
   plog/trunk/class/database/pdb/pdb.class.php
   plog/trunk/wizard.php
Log:
solved mantis issue 976 (http://bugs.lifetype.net/view.php?id=976)


Modified: plog/trunk/class/database/pdb/pdb.class.php
===================================================================
--- plog/trunk/class/database/pdb/pdb.class.php	2006-07-20 06:07:13 UTC (rev 3756)
+++ plog/trunk/class/database/pdb/pdb.class.php	2006-07-20 06:42:35 UTC (rev 3757)
@@ -82,7 +82,9 @@
     }
     
     /**
-     * ADOdb compatibility
+     * ADOdb compatibility, although this method was renamed to NewLifeTypeDataDictionary() not
+     * to collide with ADOdb's own in those system where these two libraries may be loaded at the
+     * same time (i.e. when the gallery2 plugin is loaded)
      *
      * @param driver A driver class whose data dictionary class we'd like to get. This method is obsolete
      * and you should call PDbDriverBase::getDriverDataDictionary(). This method is only here for compatibility
@@ -91,7 +93,7 @@
      * @see PDbDriverBase::getDriverDataDictionary()     
      * @deprecated
      */
-    function NewDataDictionary( $driver )
+    function NewPDbDataDictionary( $driver )
     {
         return( $driver->getDriverDataDictionary());
     }

Modified: plog/trunk/wizard.php
===================================================================
--- plog/trunk/wizard.php	2006-07-20 06:07:13 UTC (rev 3756)
+++ plog/trunk/wizard.php	2006-07-20 06:42:35 UTC (rev 3757)
@@ -873,7 +873,7 @@
                                  $config->getValue( "db_database" ));
                                  
             // create a data dictionary to give us the right sql code needed to create the tables
-            $dict = NewDataDictionary( $this->_db );
+            $dict = NewPDbDataDictionary( $this->_db );
 
            // create the tables
             $errors = false;            
@@ -1296,7 +1296,7 @@
             // make changes to the tables that need changes, but leave it up to the data dictionary
             // to take care of the changes
             // ---
-            $dict = NewDataDictionary( $this->_db );            
+            $dict = NewPDbDataDictionary( $this->_db );            
             $errors = false;
             foreach( $Tables as $name => $table ) {
                 $errorMessage = "";



More information about the pLog-svn mailing list