WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@10492 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2009-02-04 00:04:29 +00:00
parent 691eaf1f13
commit e8b009cbf3
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/import/livejournal.php
View File

@ -234,12 +234,6 @@ class LJ_API_Import {
<?php <?php
} }
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() { function import_posts() {
$total = (int) get_option( 'ljapi_total' ); $total = (int) get_option( 'ljapi_total' );
$count = (int) get_option( 'ljapi_count' ); $count = (int) get_option( 'ljapi_count' );
@ -583,7 +577,8 @@ class LJ_API_Import {
// Get the body and HTMLize it // Get the body and HTMLize it
preg_match( '|<body>(.*)</body>|is', $comment, $matches ); preg_match( '|<body>(.*)</body>|is', $comment, $matches );
$comment_content = !empty( $comment_subject ) ? $comment_subject . "\n\n" . $matches[1] : $matches[1]; $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 = wpautop( $comment_content );
$comment_content = str_replace( '<br>', '<br />', $comment_content ); $comment_content = str_replace( '<br>', '<br />', $comment_content );
$comment_content = str_replace( '<hr>', '<hr />', $comment_content ); $comment_content = str_replace( '<hr>', '<hr />', $comment_content );