Changeset 10492 for trunk/wp-admin/import/livejournal.php

Timestamp:

02/04/2009 12:04:29 AM (18 years ago)

Author:

azaozz

Message:

Fix single quote problems in LJ importer, props beaulebens, fixes #8999

File:

• trunk/wp-admin/import/livejournal.php (modified) (2 diffs)

trunk/wp-admin/import/livejournal.php

@@ -235 +235 @@
         }
         
-        function unhtmlentities($string) { // From php.net for < 4.3 compat
-                $trans_tbl = get_html_translation_table(HTML_ENTITIES);
-                $trans_tbl = array_flip($trans_tbl);
-                return strtr($string, $trans_tbl);
-        }
-        
         function import_posts() {
                 $total           = (int) get_option( 'ljapi_total' );
@@ -584 +578 @@
                 preg_match( '|<body>(.*)</body>|is', $comment, $matches );
                 $comment_content = !empty( $comment_subject ) ? $comment_subject . "\n\n" . $matches[1] : $matches[1];
-                $comment_content = $this->unhtmlentities( $comment_content );
+                $comment_content = html_entity_decode( $comment_content );
+                $comment_content = str_replace( '&apos;', "'", $comment_content );
                 $comment_content = wpautop( $comment_content );
                 $comment_content = str_replace( '<br>', '<br />', $comment_content );