IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass blog charset to html_entity_decode(). Props adferguson. fixes #7563

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@10688 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
2009-03-03 18:37:25 +00:00
parent 8fb1093aad
commit a33afa3546
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/widgets.php
View File

@@ -1505,7 +1505,7 @@ function wp_widget_rss($args, $widget_args = 1) {
$link = clean_url(strip_tags($rss->get_permalink()));
while ( strstr($link, 'http') != $link )
$link = substr($link, 1);
$desc = attribute_escape(strip_tags(html_entity_decode($rss->get_description(), ENT_QUOTES)));
$desc = attribute_escape(strip_tags(html_entity_decode($rss->get_description(), ENT_QUOTES, get_option('blog_charset'))));
$title = $options[$number]['title'];
if ( empty($title) )
$title = htmlentities(strip_tags($rss->get_title()));
@@ -1575,7 +1575,7 @@ function wp_widget_rss_output( $rss, $args = array() ) {
if ( empty($title) )
$title = __('Untitled');
$desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item->get_description(), ENT_QUOTES))));
$desc = str_replace(array("\n", "\r"), ' ', attribute_escape(strip_tags(html_entity_decode($item->get_description(), ENT_QUOTES, get_option('blog_charset')))));
$desc = wp_html_excerpt( $desc, 360 ) . ' […]';
$desc = wp_specialchars( $desc );