Ticket #21507: 21507.2.patch

wp-admin/options-reading.php

@@ -20 +20 @@
  *
  * @package WordPress
  * @subpackage Reading_Settings_Screen
+ * @since 3.1.0
  */
 function add_js() {
 ?>
@@ -41 +42 @@
 }
 add_action('admin_head', 'add_js');
 
+/**
+ * Display blog charset option.
+ *
+ * @package WordPress
+ * @subpackage Reading_Settings_Screen
+ * @since 3.5.0
+ */
+function options_reading_blog_charset() {
+        echo '<input name="blog_charset" type="text" id="blog_charset" value="' . esc_attr( get_option( 'blog_charset' ) ) . '" class="regular-text" />';
+        echo '<p class="description">' . __( 'The <a href="http://codex.wordpress.org/Glossary#Character_set">character encoding</a> of your site (UTF-8 is recommended)' ) . '</p>';
+}
+
 get_current_screen()->add_help_tab( array(
         'id'      => 'overview',
         'title'   => __('Overview'),
@@ -67 +80 @@
 <?php
 settings_fields( 'reading' );
 
-function options_reading_blog_charset() {
-        echo '<input name="blog_charset" type="text" id="blog_charset" value="' . esc_attr( get_option( 'blog_charset' ) ) . '" class="regular-text" />';
-        echo '<p class="description">' . __( 'The <a href="http://codex.wordpress.org/Glossary#Character_set">character encoding</a> of your site (UTF-8 is recommended)' ) . '</p>';
-}
-
 if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
         add_settings_field( 'blog_charset', __( 'Encoding for pages and feeds' ), 'options_reading_blog_charset', 'reading' );
 else