<!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>[22136] trunk/wp-admin: Move the static front page saving routine to a single sanitize_option() callback for show_on_front.</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/22136">22136</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-10-08 21:25:13 +0000 (Mon, 08 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move the static front page saving routine to a single sanitize_option() callback for show_on_front. page_on_front and page_for_posts are now manually set by this callback, and not separately by options.php. see <a href="http://core.trac.wordpress.org/ticket/16379">#16379</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminoptionsreadingphp">trunk/wp-admin/options-reading.php</a></li>
<li><a href="#trunkwpadminoptionsphp">trunk/wp-admin/options.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (22135 => 22136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2012-10-08 18:41:19 UTC (rev 22135)
+++ trunk/wp-admin/includes/post.php 2012-10-08 21:25:13 UTC (rev 22136)
</span><span class="lines">@@ -1337,22 +1337,37 @@
</span><span class="cx"> * @since 3.5.0
</span><span class="cx"> * @access private
</span><span class="cx"> */
</span><del>-function _create_pages_for_reading_settings() {
- // If we're saving the Reading Settings screen, intercept.
- if ( ! isset( $_POST['show_on_front'] ) )
- return;
</del><ins>+function _show_on_front_reading_settings( $show_on_front_value ) {
+ // If we're not saving the Reading Settings screen, don't intercept.
+ if ( ! $_POST || ! strpos( wp_get_referer(), 'options-reading.php' ) )
+ return $show_on_front_value;
</ins><span class="cx">
</span><ins>+ if ( 'posts' == $show_on_front_value ) {
+ update_option( 'page_on_front', 0 );
+ update_option( 'page_for_posts', 0 );
+ return $show_on_front_value;
+ }
+
</ins><span class="cx"> // If a new front page was meant to be created, go forth and create it.
</span><del>- if ( isset( $_POST['page_on_front'] ) && 'new' == $_POST['page_on_front'] ) {
</del><ins>+ if ( 'new' == $_POST['page_on_front'] ) {
+
+ // If the user can't create pages, revert.
</ins><span class="cx"> if ( ! current_user_can( 'create_posts', 'page' ) ) {
</span><del>- $_POST['page_on_front'] = 0;
- $_POST['show_on_front'] = 'posts';
- add_settings_error( 'page_on_front', __( 'You are not allowed to create pages on this site.' ) );
</del><ins>+ // If an existing page is set, keep things as is, rather than reverting to showing posts.
+ if ( get_option( 'page_on_front' ) ) {
+ $show_on_front_value = 'page';
+ } else {
+ $show_on_front_value = 'posts';
+ update_option( 'page_on_front', 0 );
+ update_option( 'page_for_posts', 0 );
+ }
+ add_settings_error( 'page_on_front', 'create_pages', __( 'You are not allowed to create pages on this site.' ) );
+ return $show_on_front_value;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $existing_page = get_page_by_title( stripslashes( $_POST['page_on_front_title'] ) );
</span><span class="cx">
</span><del>- // If page already exists and it's public, there's no need to create a new page
</del><ins>+ // If page already exists and it's public, there's no need to create a new page.
</ins><span class="cx"> if ( $existing_page && 'publish' == $existing_page->post_status ) {
</span><span class="cx"> $page_id = $existing_page->ID;
</span><span class="cx"> } else {
</span><span class="lines">@@ -1364,38 +1379,53 @@
</span><span class="cx"> 'ping_status' => 'closed',
</span><span class="cx"> // @todo Create some sort of a 'context' in postmeta so we know we created a page through these means.
</span><span class="cx"> // Consider then showing that context in the list table as a good-first-step.
</span><del>- ), true );
</del><ins>+ ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // Make sure page_on_front is properly saved by options.php.
- if ( is_wp_error( $page_id ) )
- $_POST['page_on_front'] = 0;
- else
- $_POST['page_on_front'] = $page_id;
</del><ins>+ if ( $page_id ) {
+ update_option( 'page_on_front', $page_id );
+ // If we can't save it, revert.
+ } elseif ( get_option( 'page_on_front' ) ) {
+ // If an existing page is set, keep things as is, rather than reverting to showing posts.
+ $show_on_front_value = 'page';
+ } else {
+ $show_on_front_value = 'posts';
+ update_option( 'page_on_front', 0 );
+ update_option( 'page_for_posts', 0 );
+ return $show_on_front_value;
+ }
+ } elseif ( $_POST['page_on_front'] ) {
+ update_option( 'page_on_front', $_POST['page_on_front'] );
+ } else {
+ // They didn't select a page at all. Sad face.
+ $show_on_front_value = 'posts';
+ update_option( 'page_on_front', 0 );
+ update_option( 'page_for_posts', 0 );
+ add_settings_error( 'page_on_front', 'no_page_selected', __( 'You must select a page to set a static front page.' ) );
+ return $show_on_front_value;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If a page for posts was meant to be specified, update/create it.
</span><del>- if ( ! isset( $_POST['page_for_posts'] ) )
- return;
</del><ins>+ if ( ! isset( $_POST['page_for_posts'] ) ) {
+ update_option( 'page_for_posts', 0 );
+ return $show_on_front_value;
+ }
</ins><span class="cx">
</span><span class="cx"> $page_for_posts = (int) $_POST['page_for_posts'];
</span><ins>+
</ins><span class="cx"> if ( ! $page_for_posts || ! $page = get_post( $page_for_posts, ARRAY_A ) ) {
</span><del>- $_POST['page_for_posts'] = 0;
- return;
</del><ins>+ update_option( 'page_for_posts', 0 );
+ return $show_on_front_value;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // @todo The UI (see @todo's in options-reading) should cover the next 3 conditionals,
- // which means we shouldn't need to bother with setting a settings error here.
- // However, we may wish to restore settings before bailing, beyond setting
- // page_for_posts to 0 (which we then expect to get cleaned up by options.php).
</del><span class="cx"> if ( 'page' != $page['post_type'] || ! current_user_can( 'edit_post', $page_for_posts ) ) {
</span><del>- $_POST['page_for_posts'] = 0;
- return;
</del><ins>+ update_option( 'page_for_posts', 0 );
+ return $show_on_front_value;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( 'publish' != $page['post_status'] && ! current_user_can( 'publish_post', $page_for_posts ) ) {
</span><del>- $_POST['page_for_posts'] = 0;
- return;
</del><ins>+ update_option( 'page_for_posts', 0 );
+ return $show_on_front_value;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $args = add_magic_quotes( $page );
</span><span class="lines">@@ -1407,8 +1437,9 @@
</span><span class="cx"> $args['ping_status'] = 'closed';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $page_id = wp_insert_post( $args, true );
- if ( is_wp_error( $page_id ) )
- $_POST['page_for_posts'] = 0;
</del><ins>+ $page_id = wp_insert_post( $args );
+ update_option( 'page_for_posts', $page_id );
+
+ return $show_on_front_value;
</ins><span class="cx"> }
</span><del>-add_filter( 'admin_init', '_create_pages_for_reading_settings' );
</del><ins>+add_filter( 'sanitize_option_show_on_front', '_show_on_front_reading_settings' );
</ins></span></pre></div>
<a id="trunkwpadminoptionsreadingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-reading.php (22135 => 22136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-reading.php 2012-10-08 18:41:19 UTC (rev 22135)
+++ trunk/wp-admin/options-reading.php 2012-10-08 21:25:13 UTC (rev 22136)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx"> section.toggleClass('page-on-front', checked);
</span><span class="cx"> if ( checked )
</span><span class="cx"> $('#page_for_posts').prop('checked', true).change();
</span><ins>+ else
+ section.removeClass('page-for-posts');
</ins><span class="cx"> });
</span><span class="cx"> $('#page_for_posts').change( function() {
</span><span class="cx"> section.toggleClass('page-for-posts', $(this).prop('checked'));
</span><span class="lines">@@ -116,7 +118,8 @@
</span><span class="cx"> // We must also check that the user can edit this page and publish a page.
</span><span class="cx"> // Otherwise, we must assume they cannot create pages (throughout), and thus
</span><span class="cx"> // should fall back to the dropdown.
</span><del>- if ( ! $page_for_posts = get_page_by_path( sanitize_title( $title ) ) ) {
</del><ins>+ $page_for_posts = get_page_by_path( sanitize_title( $title ) );
+ if ( ! $page_for_posts || $page_for_posts->ID == get_option( 'page_on_front' ) ) {
</ins><span class="cx"> $page_for_posts = get_default_post_to_edit( 'page', true );
</span><span class="cx"> $page_for_posts->post_title = $title;
</span><span class="cx"> $page_for_posts->post_name = sanitize_title( $title );
</span></span></pre></div>
<a id="trunkwpadminoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options.php (22135 => 22136)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options.php 2012-10-08 18:41:19 UTC (rev 22135)
+++ trunk/wp-admin/options.php 2012-10-08 21:25:13 UTC (rev 22136)
</span><span class="lines">@@ -62,7 +62,7 @@
</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' ),
</span><del>- 'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'show_on_front', 'page_on_front', 'page_for_posts', 'blog_public' ),
</del><ins>+ 'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'show_on_front', 'blog_public' ),
</ins><span class="cx"> 'writing' => array( 'use_smilies', 'default_category', 'default_email_category', 'use_balanceTags', 'default_link_category', 'default_post_format' )
</span><span class="cx"> );
</span><span class="cx"> $whitelist_options['misc'] = $whitelist_options['options'] = $whitelist_options['privacy'] = array();
</span></span></pre>
</div>
</div>
</body>
</html>