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

In `fetch_feed()`, call `->set_output_encoding()` on the `SimplePie` instance to ensure the feed is served with encoding specified by the `blog_charset` option. 

Props chriscct7.
Fixes #10713.

Built from https://develop.svn.wordpress.org/trunk@32469


git-svn-id: http://core.svn.wordpress.org/trunk@32439 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-05-09 06:49:24 +00:00
parent 3ec1d3bf9d
commit a6428fe295
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wp-includes/feed.php
View File

@ -642,6 +642,7 @@ function fetch_feed( $url ) {
*/ */
do_action_ref_array( 'wp_feed_options', array( &$feed, $url ) ); do_action_ref_array( 'wp_feed_options', array( &$feed, $url ) );
$feed->init(); $feed->init();
$feed->set_output_encoding( get_option( 'blog_charset' ) );
$feed->handle_content_type(); $feed->handle_content_type();
if ( $feed->error() ) if ( $feed->error() )

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-alpha-32468'; $wp_version = '4.3-alpha-32469';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.