<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[21838] trunk/wp-admin: Fold Privacy Settings into Reading Settings, moving blog_public (search engine/robots) to options-reading and removing options-privacy.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/21838">21838</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-09-13 17:28:57 +0000 (Thu, 13 Sep 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fold Privacy Settings into Reading Settings, moving blog_public (search engine/robots) to options-reading and removing options-privacy.
When blog_public only has two values (as judged by whether the blog_privacy_selector action is used), convert from radio buttons to a checkbox, and rename from 'Site Visibility' to a more specific 'Search Engine Visibility'.
The text and implementation may change a bit. see <a href="http://core.trac.wordpress.org/ticket/16416">#16416</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpadminoptionsprivacyphp">trunk/wp-admin/options-privacy.php</a></li>
<li><a href="#trunkwpadminoptionsreadingphp">trunk/wp-admin/options-reading.php</a></li>
<li><a href="#trunkwpadminoptionswritingphp">trunk/wp-admin/options-writing.php</a></li>
<li><a href="#trunkwpadminoptionsphp">trunk/wp-admin/options.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (21837 => 21838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2012-09-13 17:17:47 UTC (rev 21837)
+++ trunk/wp-admin/includes/dashboard.php 2012-09-13 17:28:57 UTC (rev 21838)
</span><span class="lines">@@ -392,12 +392,12 @@
</span><span class="cx"> }
</span><span class="cx"> echo '</p>';
</span><span class="cx">
</span><del>- // Check if search engines are blocked.
</del><ins>+ // Check if search engines are asked not to index this site.
</ins><span class="cx"> if ( !is_network_admin() && !is_user_admin() && current_user_can('manage_options') && '1' != get_option('blog_public') ) {
</span><span class="cx"> $title = apply_filters('privacy_on_link_title', __('Your site is asking search engines not to index its content') );
</span><del>- $content = apply_filters('privacy_on_link_text', __('Search Engines Blocked') );
</del><ins>+ $content = apply_filters('privacy_on_link_text', __('Search Engines Discouraged') );
</ins><span class="cx">
</span><del>- echo "<p><a href='options-privacy.php' title='$title'>$content</a></p>";
</del><ins>+ echo "<p><a href='options-reading.php' title='$title'>$content</a></p>";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> update_right_now_message();
</span><span class="lines">@@ -1260,7 +1260,6 @@
</span><span class="cx"> <h4><span class="icon16 icon-settings"></span> <?php _e( 'Basic Settings' ); ?></h4>
</span><span class="cx"> <p><?php _e( 'Here are a few easy things you can do to get your feet wet. Make sure to click Save on each Settings screen.' ); ?></p>
</span><span class="cx"> <ul>
</span><del>- <li><?php echo sprintf( __( '<a href="%s">Choose your privacy setting</a>' ), esc_url( admin_url('options-privacy.php') ) ); ?></li>
</del><span class="cx"> <li><?php echo sprintf( __( '<a href="%s">Select your tagline and time zone</a>' ), esc_url( admin_url('options-general.php') ) ); ?></li>
</span><span class="cx"> <li><?php echo sprintf( __( '<a href="%s">Turn comments on or off</a>' ), esc_url( admin_url('options-discussion.php') ) ); ?></li>
</span><span class="cx"> <li><?php echo sprintf( __( '<a href="%s">Fill in your profile</a>' ), esc_url( get_edit_profile_url( get_current_user_id() ) ) ); ?></li>
</span></span></pre></div>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (21837 => 21838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2012-09-13 17:17:47 UTC (rev 21837)
+++ trunk/wp-admin/includes/plugin.php 2012-09-13 17:28:57 UTC (rev 21838)
</span><span class="lines">@@ -1624,10 +1624,15 @@
</span><span class="cx"> global $new_whitelist_options;
</span><span class="cx">
</span><span class="cx"> if ( 'misc' == $option_group ) {
</span><del>- _deprecated_argument( __FUNCTION__, '3.0', __( 'The miscellaneous options group has been removed. Use another settings group.' ) );
</del><ins>+ _deprecated_argument( __FUNCTION__, '3.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'misc' ) );
</ins><span class="cx"> $option_group = 'general';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( 'privacy' == $option_group ) {
+ _deprecated_argument( __FUNCTION__, '3.5', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'privacy' ) );
+ $option_group = 'reading';
+ }
+
</ins><span class="cx"> $new_whitelist_options[ $option_group ][] = $option_name;
</span><span class="cx"> if ( $sanitize_callback != '' )
</span><span class="cx"> add_filter( "sanitize_option_{$option_name}", $sanitize_callback );
</span><span class="lines">@@ -1647,10 +1652,15 @@
</span><span class="cx"> global $new_whitelist_options;
</span><span class="cx">
</span><span class="cx"> if ( 'misc' == $option_group ) {
</span><del>- _deprecated_argument( __FUNCTION__, '3.0', __( 'The miscellaneous options group has been removed. Use another settings group.' ) );
</del><ins>+ _deprecated_argument( __FUNCTION__, '3.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'misc' ) );
</ins><span class="cx"> $option_group = 'general';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( 'privacy' == $option_group ) {
+ _deprecated_argument( __FUNCTION__, '3.5', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'privacy' ) );
+ $option_group = 'reading';
+ }
+
</ins><span class="cx"> $pos = array_search( $option_name, (array) $new_whitelist_options );
</span><span class="cx"> if ( $pos !== false )
</span><span class="cx"> unset( $new_whitelist_options[ $option_group ][ $pos ] );
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (21837 => 21838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2012-09-13 17:17:47 UTC (rev 21837)
+++ trunk/wp-admin/includes/template.php 2012-09-13 17:28:57 UTC (rev 21838)
</span><span class="lines">@@ -1040,10 +1040,15 @@
</span><span class="cx"> global $wp_settings_sections;
</span><span class="cx">
</span><span class="cx"> if ( 'misc' == $page ) {
</span><del>- _deprecated_argument( __FUNCTION__, '3.0', __( 'The miscellaneous options group has been removed. Use another settings group.' ) );
</del><ins>+ _deprecated_argument( __FUNCTION__, '3.0', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'misc' ) );
</ins><span class="cx"> $page = 'general';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( 'privacy' == $page ) {
+ _deprecated_argument( __FUNCTION__, '3.5', sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ), 'privacy' ) );
+ $page = 'reading';
+ }
+
</ins><span class="cx"> if ( !isset($wp_settings_sections) )
</span><span class="cx"> $wp_settings_sections = array();
</span><span class="cx"> if ( !isset($wp_settings_sections[$page]) )
</span><span class="lines">@@ -1084,6 +1089,11 @@
</span><span class="cx"> $page = 'general';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ( 'privacy' == $page ) {
+ _deprecated_argument( __FUNCTION__, '3.5', __( 'The privacy options group has been removed. Use another settings group.' ) );
+ $page = 'reading';
+ }
+
</ins><span class="cx"> if ( !isset($wp_settings_fields) )
</span><span class="cx"> $wp_settings_fields = array();
</span><span class="cx"> if ( !isset($wp_settings_fields[$page]) )
</span></span></pre></div>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (21837 => 21838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2012-09-13 17:17:47 UTC (rev 21837)
+++ trunk/wp-admin/menu.php 2012-09-13 17:28:57 UTC (rev 21838)
</span><span class="lines">@@ -206,7 +206,6 @@
</span><span class="cx"> $submenu['options-general.php'][20] = array(__('Reading'), 'manage_options', 'options-reading.php');
</span><span class="cx"> $submenu['options-general.php'][25] = array(__('Discussion'), 'manage_options', 'options-discussion.php');
</span><span class="cx"> $submenu['options-general.php'][30] = array(__('Media'), 'manage_options', 'options-media.php');
</span><del>- $submenu['options-general.php'][35] = array(__('Privacy'), 'manage_options', 'options-privacy.php');
</del><span class="cx"> $submenu['options-general.php'][40] = array(__('Permalinks'), 'manage_options', 'options-permalink.php');
</span><span class="cx">
</span><span class="cx"> $_wp_last_utility_menu = 80; // The index of the last top-level menu in the utility menu group
</span></span></pre></div>
<a id="trunkwpadminoptionsprivacyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-privacy.php (21837 => 21838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-privacy.php 2012-09-13 17:17:47 UTC (rev 21837)
+++ trunk/wp-admin/options-privacy.php 2012-09-13 17:28:57 UTC (rev 21838)
</span><span class="lines">@@ -1,63 +0,0 @@
</span><del>-<?php
-/**
- * Privacy Options Settings Administration Screen.
- *
- * @package WordPress
- * @subpackage Administration
- */
-
-/** Load WordPress Administration Bootstrap */
-require_once('./admin.php');
-
-if ( ! current_user_can( 'manage_options' ) )
- wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) );
-
-$title = __('Privacy Settings');
-$parent_file = 'options-general.php';
-
-get_current_screen()->add_help_tab( array(
- 'id' => 'overview',
- 'title' => __('Overview'),
- 'content' => '<p>' . __('You can choose whether or not your site will be crawled by robots, ping services, and spiders. If you want those services to ignore your site, click the radio button next to &#8220;Ask search engines not to index this site&#8221; and click the Save Changes button at the bottom of the screen. Note that your privacy is not complete; your site is still visible on the web.') . '</p>' .
- '<p>' . __('When this setting is in effect a reminder is shown in the Right Now box of the Dashboard that says, &#8220;Search Engines Blocked,&#8221; to remind you that your site is not being crawled.') . '</p>',
-) );
-
-get_current_screen()->set_help_sidebar(
- '<p><strong>' . __('For more information:') . '</strong></p>' .
- '<p>' . __('<a href="http://codex.wordpress.org/Settings_Privacy_Screen" target="_blank">Documentation on Privacy Settings</a>') . '</p>' .
- '<p>' . __('<a href="http://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
-);
-
-include('./admin-header.php');
-?>
-
-<div class="wrap">
-<?php screen_icon(); ?>
-<h2><?php echo esc_html( $title ); ?></h2>
-
-<form method="post" action="options.php">
-<?php settings_fields('privacy'); ?>
-
-<table class="form-table">
-<tr valign="top">
-<th scope="row"><?php _e( 'Site Visibility' ); ?> </th>
-<td><fieldset><legend class="screen-reader-text"><span><?php _e( 'Site Visibility' ); ?> </span></legend>
-<input id="blog-public" type="radio" name="blog_public" value="1" <?php checked('1', get_option('blog_public')); ?> />
-<label for="blog-public"><?php _e( 'Allow search engines to index this site.' );?></label><br/>
-<input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> />
-<label for="blog-norobots"><?php _e( 'Ask search engines not to index this site.' ); ?></label>
-<p class="description"><?php _e( 'Note: Neither of these options blocks access to your site &mdash; it is up to search engines to honor your request.' ); ?></p>
-<?php do_action('blog_privacy_selector'); ?>
-</fieldset></td>
-</tr>
-<?php do_settings_fields('privacy', 'default'); ?>
-</table>
-
-<?php do_settings_sections('privacy'); ?>
-
-<?php submit_button(); ?>
-</form>
-
-</div>
-
-<?php include('./admin-footer.php') ?>
</del></span></pre></div>
<a id="trunkwpadminoptionsreadingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-reading.php (21837 => 21838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-reading.php 2012-09-13 17:17:47 UTC (rev 21837)
+++ trunk/wp-admin/options-reading.php 2012-09-13 17:28:57 UTC (rev 21838)
</span><span class="lines">@@ -50,6 +50,13 @@
</span><span class="cx"> '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
</span><span class="cx"> ) );
</span><span class="cx">
</span><ins>+get_current_screen()->add_help_tab( array(
+ 'id' => 'site-visibility',
+ 'title' => has_action( 'blog_privacy_selector' ) ? __( 'Site Visibility' ) : __( 'Search Engine Visibility' ),
+ 'content' => '<p>' . __( 'You can choose whether or not your site will be crawled by robots, ping services, and spiders. If you want those services to ignore your site, click the radio button next to &#8220;Ask search engines not to index this site&#8221; and click the Save Changes button at the bottom of the screen. Note that your privacy is not complete; your site is still visible on the web.' ) . '</p>' .
+ '<p>' . __( 'When this setting is in effect a reminder is shown in the Right Now box of the Dashboard that says, &#8220;Search Engines Discouraged,&#8221; to remind you that your site is not being crawled.' ) . '</p>',
+) );
+
</ins><span class="cx"> get_current_screen()->set_help_sidebar(
</span><span class="cx"> '<p><strong>' . __('For more information:') . '</strong></p>' .
</span><span class="cx"> '<p>' . __('<a href="http://codex.wordpress.org/Settings_Reading_Screen" target="_blank">Documentation on Reading Settings</a>') . '</p>' .
</span><span class="lines">@@ -63,7 +70,7 @@
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx">
</span><del>-<form name="form1" method="post" action="options.php">
</del><ins>+<form method="post" action="options.php">
</ins><span class="cx"> <?php
</span><span class="cx"> settings_fields( 'reading' );
</span><span class="cx">
</span><span class="lines">@@ -132,6 +139,24 @@
</span><span class="cx"> </fieldset></td>
</span><span class="cx"> </tr>
</span><span class="cx">
</span><ins>+<tr valign="top">
+<th scope="row"><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site Visibility' ) : _e( 'Search Engine Visibility' ); ?> </th>
+<td><fieldset><legend class="screen-reader-text"><span><?php has_action( 'blog_privacy_selector' ) ? _e( 'Site Visibility' ) : _e( 'Search Engine Visibility' ); ?> </span></legend>
+<?php if ( has_action( 'blog_privacy_selector' ) ) : ?>
+ <input id="blog-public" type="radio" name="blog_public" value="1" <?php checked('1', get_option('blog_public')); ?> />
+ <label for="blog-public"><?php _e( 'Allow search engines to index this site.' );?></label><br/>
+ <input id="blog-norobots" type="radio" name="blog_public" value="0" <?php checked('0', get_option('blog_public')); ?> />
+ <label for="blog-norobots"><?php _e( 'Ask search engines not to index this site.' ); ?></label>
+ <p class="description"><?php _e( 'Note: Neither of these options blocks access to your site &mdash; it is up to search engines to honor your request.' ); ?></p>
+ <?php do_action('blog_privacy_selector'); ?>
+<?php else : ?>
+ <label for="blog_public"><input name="blog_public" type="checkbox" id="blog_public" value="1" <?php checked( '1', get_option( 'blog_public' ) ); ?> />
+ <?php _e( 'Allow search engines to index this site' ); ?>
+ <p class="description"><?php _e( 'It is up to search engines to honor a request to not index this site.' ); ?></p>
+<?php endif; ?>
+</fieldset></td>
+</tr>
+
</ins><span class="cx"> <?php do_settings_fields( 'reading', 'default' ); ?>
</span><span class="cx"> </table>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminoptionswritingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-writing.php (21837 => 21838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-writing.php 2012-09-13 17:17:47 UTC (rev 21837)
+++ trunk/wp-admin/options-writing.php 2012-09-13 17:28:57 UTC (rev 21838)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx">
</span><span class="cx"> <?php else : ?>
</span><span class="cx">
</span><del>- <p><?php printf(__('WordPress is not notifying any <a href="http://codex.wordpress.org/Update_Services">Update Services</a> because of your site&#8217;s <a href="%s">privacy settings</a>.'), 'options-privacy.php'); ?></p>
</del><ins>+ <p><?php printf(__('WordPress is not notifying any <a href="http://codex.wordpress.org/Update_Services">Update Services</a> because of your site&#8217;s <a href="%s">visibility settings</a>.'), 'options-reading.php'); ?></p>
</ins><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php } // multisite ?>
</span></span></pre></div>
<a id="trunkwpadminoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options.php (21837 => 21838)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options.php 2012-09-13 17:17:47 UTC (rev 21837)
+++ trunk/wp-admin/options.php 2012-09-13 17:28:57 UTC (rev 21838)
</span><span class="lines">@@ -62,10 +62,10 @@
</span><span class="cx"> 'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string' ),
</span><span class="cx"> 'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
</span><span class="cx"> 'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type', 'embed_autourls', 'embed_size_w', 'embed_size_h' ),
</span><del>- 'privacy' => array( 'blog_public' ),
- 'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'blog_charset', 'show_on_front', 'page_on_front', 'page_for_posts' ),
- 'writing' => array( 'default_post_edit_rows', 'use_smilies', 'default_category', 'default_email_category', 'use_balanceTags', 'default_link_category', 'default_post_format' ),
- 'options' => array( '' ) );
</del><ins>+ 'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'blog_charset', 'show_on_front', 'page_on_front', 'page_for_posts', 'blog_public' ),
+ 'writing' => array( 'default_post_edit_rows', 'use_smilies', 'default_category', 'default_email_category', 'use_balanceTags', 'default_link_category', 'default_post_format' )
+);
+$whitelist_options['misc'] = $whitelist_options['options'] = $whitelist_options['privacy'] = array();
</ins><span class="cx">
</span><span class="cx"> $mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass');
</span><span class="cx"> $uploads_options = array('uploads_use_yearmonth_folders', 'upload_path', 'upload_url_path');
</span><span class="lines">@@ -90,8 +90,6 @@
</span><span class="cx">
</span><span class="cx"> if ( apply_filters( 'enable_post_by_email_configuration', true ) )
</span><span class="cx"> $whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
</span><del>-
- $whitelist_options[ 'misc' ] = array();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $whitelist_options = apply_filters( 'whitelist_options', $whitelist_options );
</span></span></pre>
</div>
</div>
</body>
</html>