diff -Nur wordpress-2.7.1/wp-admin/import/blogger.php wordpress-devel/wp-admin/import/blogger.php
old
|
new
|
|
437 | 437 | if ( count( $matches[1] ) ) |
438 | 438 | foreach ( $matches[1] as $match ) |
439 | 439 | if ( preg_match('/rel=.previous./', $match) ) |
440 | | $query = html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match) ); |
| 440 | $query = html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match), ENT_COMPAT, get_option('blog_charset') ); |
441 | 441 | |
442 | 442 | if ( $query ) { |
443 | 443 | parse_str($query, $q); |
… |
… |
|
495 | 495 | if ( count( $matches[1] ) ) |
496 | 496 | foreach ( $matches[1] as $match ) |
497 | 497 | if ( preg_match('/rel=.previous./', $match) ) |
498 | | $query = html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match) ); |
| 498 | $query = html_entity_decode( preg_replace('/^.*href=[\'"].*\?(.+)[\'"].*$/', '$1', $match), ENT_COMPAT, get_option('blog_charset') ); |
499 | 499 | |
500 | 500 | parse_str($query, $q); |
501 | 501 | |
… |
… |
|
545 | 545 | } |
546 | 546 | |
547 | 547 | $post_date = $this->convert_date( $entry->published ); |
548 | | $post_content = trim( addslashes( $this->no_apos( html_entity_decode( $entry->content ) ) ) ); |
| 548 | $post_content = trim( addslashes( $this->no_apos( html_entity_decode( $entry->content, ENT_COMPAT, get_option('blog_charset') ) ) ) ); |
549 | 549 | $post_title = trim( addslashes( $this->no_apos( $this->min_whitespace( $entry->title ) ) ) ); |
550 | 550 | $post_status = isset( $entry->draft ) ? 'draft' : 'publish'; |
551 | 551 | |
… |
… |
|
600 | 600 | $comment_author = addslashes( $this->no_apos( strip_tags( (string) $matches[1] ) ) ); |
601 | 601 | $comment_author_url = addslashes( $this->no_apos( strip_tags( (string) $matches[2] ) ) ); |
602 | 602 | $comment_date = $this->convert_date( $entry->updated ); |
603 | | $comment_content = addslashes( $this->no_apos( html_entity_decode( $entry->content ) ) ); |
| 603 | $comment_content = addslashes( $this->no_apos( html_entity_decode( $entry->content, ENT_COMPAT, get_option('blog_charset') ) ) ); |
604 | 604 | |
605 | 605 | // Clean up content |
606 | 606 | $comment_content = preg_replace_callback('|<(/?[A-Z]+)|', create_function('$match', 'return "<" . strtolower($match[1]);'), $comment_content); |
diff -Nur wordpress-2.7.1/wp-admin/includes/dashboard.php wordpress-devel/wp-admin/includes/dashboard.php
old
|
new
|
|
731 | 731 | $title = $item['title']; |
732 | 732 | $title = wp_specialchars( $title ); |
733 | 733 | |
734 | | $description = wp_specialchars( strip_tags(html_entity_decode($item['description'], ENT_QUOTES)) ); |
| 734 | $description = wp_specialchars( strip_tags(html_entity_decode($item['description'], ENT_QUOTES, get_option('blog_charset'))) ); |
735 | 735 | |
736 | 736 | list($link, $frag) = explode( '#', $item['link'] ); |
737 | 737 | |
diff -Nur wordpress-2.7.1/wp-includes/feed.php wordpress-devel/wp-includes/feed.php
old
|
new
|
|
340 | 340 | elseif ( 'atom' == $type ) |
341 | 341 | $the_list .= sprintf( '<category scheme="%1$s" term="%2$s" />', attribute_escape( apply_filters( 'get_bloginfo_rss', get_bloginfo( 'url' ) ) ), attribute_escape( $cat_name ) ); |
342 | 342 | else |
343 | | $the_list .= "\n\t\t<category><![CDATA[" . html_entity_decode( $cat_name ) . "]]></category>\n"; |
| 343 | $the_list .= "\n\t\t<category><![CDATA[" . html_entity_decode( $cat_name, ENT_COMPAT, get_option('blog_charset') ) . "]]></category>\n"; |
344 | 344 | } |
345 | 345 | |
346 | 346 | return apply_filters('the_category_rss', $the_list, $type); |
diff -Nur wordpress-2.7.1/wp-includes/widgets.php wordpress-devel/wp-includes/widgets.php
old
|
new
|
|
1508 | 1508 | $link = clean_url(strip_tags($rss->channel['link'])); |
1509 | 1509 | while ( strstr($link, 'http') != $link ) |
1510 | 1510 | $link = substr($link, 1); |
1511 | | $desc = attribute_escape(strip_tags(html_entity_decode($rss->channel['description'], ENT_QUOTES))); |
| 1511 | $desc = attribute_escape(strip_tags(html_entity_decode($rss->channel['description'], ENT_QUOTES, get_option('blog_charset')))); |
1512 | 1512 | $title = $options[$number]['title']; |
1513 | 1513 | if ( empty($title) ) |
1514 | 1514 | $title = htmlentities(strip_tags($rss->channel['title'])); |
… |
… |
|
1577 | 1577 | $title = __('Untitled'); |
1578 | 1578 | $desc = ''; |
1579 | 1579 | if ( isset( $item['description'] ) && is_string( $item['description'] ) ) |
1580 | | $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['description'], ENT_QUOTES)))); |
| 1580 | $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['description'], ENT_QUOTES, get_option('blog_charset'))))); |
1581 | 1581 | elseif ( isset( $item['summary'] ) && is_string( $item['summary'] ) ) |
1582 | | $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['summary'], ENT_QUOTES)))); |
| 1582 | $desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item['summary'], ENT_QUOTES, get_option('blog_charset'))))); |
1583 | 1583 | if ( 360 < strlen( $desc ) ) |
1584 | 1584 | $desc = wp_html_excerpt( $desc, 360 ) . ' […]'; |
1585 | 1585 | $summary = $desc; |