Changeset 10688 for trunk/wp-includes/widgets.php

Timestamp:

03/03/2009 06:37:25 PM (16 years ago)

Author:

ryan

Message:

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

File:

• trunk/wp-includes/widgets.php (modified) (2 diffs)

trunk/wp-includes/widgets.php

@@ -1506 +1506 @@
     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) )
@@ -1576 +1576 @@
             $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 );