Changeset 3650 for trunk/wp-admin/import/dotclear.php

Timestamp:

03/21/2006 12:14:18 AM (19 years ago)

Author:

ryan

Message:

Allow alternative table prefix in dotclear importer. Props thomasq. fixes #2388

File:

• trunk/wp-admin/import/dotclear.php (modified) (7 diffs)

trunk/wp-admin/import/dotclear.php

@@ -158 +158 @@
         $dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost'));
         set_magic_quotes_runtime(0);
-        $prefix = get_option('tpre');
+        $dbprefix = get_option('dcdbprefix');
 
         // Get Categories
-        return $dcdb->get_results('SELECT * FROM dc_categorie', ARRAY_A);
+        return $dcdb->get_results('SELECT * FROM '.$dbprefix.'categorie', ARRAY_A);
     }
 
@@ -170 +170 @@
         $dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost'));
         set_magic_quotes_runtime(0);
-        $prefix = get_option('tpre');
+        $dbprefix = get_option('dcdbprefix');
 
         // Get Users
 
-        return $dcdb->get_results('SELECT * FROM dc_user', ARRAY_A);
+        return $dcdb->get_results('SELECT * FROM '.$dbprefix.'user', ARRAY_A);
     }
 
@@ -182 +182 @@
         $dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost'));
         set_magic_quotes_runtime(0);
-        $prefix = get_option('tpre');
+        $dbprefix = get_option('dcdbprefix');
 
         // Get Posts
-        return $dcdb->get_results('SELECT dc_post.*, dc_categorie.cat_libelle_url AS post_cat_name
-                        FROM dc_post INNER JOIN dc_categorie
-                          ON dc_post.cat_id = dc_categorie.cat_id', ARRAY_A);
+        return $dcdb->get_results('SELECT '.$dbprefix.'post.*, '.$dbprefix.'categorie.cat_libelle_url AS post_cat_name
+                        FROM '.$dbprefix.'post INNER JOIN '.$dbprefix.'categorie
+                          ON '.$dbprefix.'post.cat_id = '.$dbprefix.'categorie.cat_id', ARRAY_A);
     }
 
@@ -196 +196 @@
         $dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost'));
         set_magic_quotes_runtime(0);
-        $prefix = get_option('tpre');
+        $dbprefix = get_option('dcdbprefix');
 
         // Get Comments
-        return $dcdb->get_results('SELECT * FROM dc_comment', ARRAY_A);
+        return $dcdb->get_results('SELECT * FROM '.$dbprefix.'comment', ARRAY_A);
     }
 
@@ -207 +207 @@
         $dcdb = new wpdb(get_option('dcuser'), get_option('dcpass'), get_option('dcname'), get_option('dchost'));
         set_magic_quotes_runtime(0);
-        $dbprefix = get_option('dbprefix');
+        $dbprefix = get_option('dcdbprefix');
 
         return $dcdb->get_results('SELECT * FROM '.$dbprefix.'link ORDER BY position', ARRAY_A);
@@ -610 +610 @@
     function cleanup_dcimport()
     {
-        delete_option('dbprefix');
+        delete_option('dcdbprefix');
         delete_option('dc_cats');
         delete_option('dcid2wpid');
@@ -700 +700 @@
             if($_POST['dbprefix'])
             {
-                if(get_option('tpre'))
-                    delete_option('tpre');
-                add_option('tpre',$_POST['dbprefix']); 
+                if(get_option('dcdbprefix'))
+                    delete_option('dcdbprefix');
+                add_option('dcdbprefix',$_POST['dbprefix']); 
             }