[php-blog-cvs] serendipity/include/admin/importers wordpress.inc.php,1.5,1.6

[Evan N. <tad...@us...>]

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

Modified Files:
	wordpress.inc.php 
Log Message:
s/COULDNT_COULDNT/COULDNT/, should now properly honour the WP preference for allowing comments.

Index: wordpress.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/importers/wordpress.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- wordpress.inc.php	2 Dec 2004 10:54:56 -0000	1.5
+++ wordpress.inc.php	3 Dec 2004 04:41:32 -0000	1.6
@@ -97,7 +97,7 @@
         /* Users */
         $res = @mysql_query("SELECT ID, user_login, user_pass, user_email, user_level FROM {$this->data['prefix']}users;", $wpdb);
         if ( !$res ) {
-            return sprintf(COULDNT_COULDNT_SELECT_USER_INFO, mysql_error($wpdb));
+            return sprintf(COULDNT_SELECT_USER_INFO, mysql_error($wpdb));
         }
 
         for ( $x=0 ; $x<mysql_num_rows($res) ; $x++ ) {
@@ -172,7 +172,7 @@
 
             $entry = array('title' => $entries[$x]['post_title'], // htmlentities() is called later, so we can leave this.
                            'isdraft' => ($entries[$x]['post_status'] == 'publish') ? 'false' : 'true',
-                           'allow_comments' => ($entries[$x]['comment_status '] == 'open ') ? 'true' : 'false',
+                           'allow_comments' => ($entries[$x]['comment_status '] == 'open' ) ? 'true' : 'false',
                            'timestamp' => strtotime($entries[$x]['post_date']),
                            'body' => strtr($entries[$x]['post_content'], $trans_table));