[php-blog-cvs] serendipity/include/admin/importers wordpress.inc.php,1.8,1.9 nucleus.inc.php,1.2,1.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin/importers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5925

Modified Files:
	wordpress.inc.php nucleus.inc.php 
Log Message:
fix comment counter, fix category detection


Index: wordpress.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/wordpress.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- wordpress.inc.php	26 Jan 2005 14:14:05 -0000	1.8
+++ wordpress.inc.php	14 Feb 2005 12:51:33 -0000	1.9
@@ -233,7 +233,8 @@
                                      'type'      => 'NORMAL');
 
                     serendipity_db_insert('comments', $this->strtrRecursive($comment, $trans_table));
-                    serendipity_approveComment($cid, $id, true);
+                    $cid = serendipity_db_insert_id('comments', 'id');
+                    serendipity_approveComment($cid, $entry['entryid'], true);
                 }
             }
         }

Index: nucleus.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/nucleus.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nucleus.inc.php	30 Jan 2005 18:23:16 -0000	1.2
+++ nucleus.inc.php	14 Feb 2005 12:51:34 -0000	1.3
@@ -178,7 +178,7 @@
 
             /* Entry/category */
             foreach ($categories as $category) {
-                if ($category['cat_ID'] == $entry['icat'] ) {
+                if ($category['cat_ID'] == $entries[$x]['icat'] ) {
                     $data = array('entryid'    => $entries[$x]['entryid'],
                                   'categoryid' => $category['categoryid']);
                     serendipity_db_insert('entrycat', $this->strtrRecursive($data, $trans_table));
@@ -225,7 +225,8 @@
                                      'type'      => 'NORMAL');
 
                     serendipity_db_insert('comments', $this->strtrRecursive($comment, $trans_table));
-                    serendipity_approveComment($cid, $id, true);
+                    $cid = serendipity_db_insert_id('comments', 'id');
+                    serendipity_approveComment($cid, $entry['entryid'], true);
                 }
             }
         }