diff --git a/wp-admin/import/dotclear.php b/wp-admin/import/dotclear.php index 7d675096e..8b32ff135 100644 --- a/wp-admin/import/dotclear.php +++ b/wp-admin/import/dotclear.php @@ -1,4 +1,9 @@ get_results('SELECT * FROM dc_link ORDER BY position', ARRAY_A); + return $dcdb->get_results('SELECT * FROM '.$dbprefix.'link ORDER BY position', ARRAY_A); } function cat2wp($categories='') @@ -349,6 +354,7 @@ class Dotclear_Import { $Title = $wpdb->escape(csc ($post_titre)); $post_content = textconv ($post_content); + $post_excerpt = ""; if ($post_chapo != "") { $post_excerpt = textconv ($post_chapo); $post_content = $post_excerpt ."\n\n".$post_content; @@ -603,7 +609,7 @@ class Dotclear_Import { function cleanup_dcimport() { - delete_option('tpre'); + delete_option('dbprefix'); delete_option('dc_cats'); delete_option('dcid2wpid'); delete_option('dccat2wpcat'); @@ -644,7 +650,7 @@ class Dotclear_Import { printf('
  • ', __('Dotclear Database Password:')); printf('
  • ', __('Dotclear Database Name:')); printf('
  • ', __('Dotclear Database Host:')); - /* printf('
  • ', __('Dotclear Table prefix (if any):')); */ + printf('
  • ', __('Dotclear Table prefix:')); printf('
  • ', __('Originating character set:')); echo ''; }