<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[14650] trunk: Remove default_comment_status_pages setting.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14650">14650</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-05-15 04:56:56 +0000 (Sat, 15 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove default_comment_status_pages setting. Reverts <a href="http://trac.wordpress.org/changeset/14451">[14451]</a>, <a href="http://trac.wordpress.org/changeset/14448">[14448]</a> for 3.0. see <a href="http://trac.wordpress.org/ticket/12991">#12991</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpadminoptionsdiscussionphp">trunk/wp-admin/options-discussion.php</a></li>
<li><a href="#trunkwpadminoptionsphp">trunk/wp-admin/options.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.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 (14649 => 14650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-05-15 04:47:03 UTC (rev 14649)
+++ trunk/wp-admin/includes/post.php 2010-05-15 04:56:56 UTC (rev 14650)
</span><span class="lines">@@ -385,11 +385,7 @@
</span><span class="cx"> $post->post_status = 'draft';
</span><span class="cx"> $post->to_ping = '';
</span><span class="cx"> $post->pinged = '';
</span><del>- if ( 'page' == $post_type ) {
- $post->comment_status = get_option( 'default_comment_status_page' );
- } else {
- $post->comment_status = get_option( 'default_comment_status' );
- }
</del><ins>+ $post->comment_status = get_option( 'default_comment_status' );
</ins><span class="cx"> $post->ping_status = get_option( 'default_ping_status' );
</span><span class="cx"> $post->post_pingback = get_option( 'default_pingback_flag' );
</span><span class="cx"> $post->post_category = get_option( 'default_category' );
</span></span></pre></div>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (14649 => 14650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2010-05-15 04:47:03 UTC (rev 14649)
+++ trunk/wp-admin/includes/schema.php 2010-05-15 04:56:56 UTC (rev 14650)
</span><span class="lines">@@ -215,7 +215,6 @@
</span><span class="cx"> 'mailserver_port' => 110,
</span><span class="cx"> 'default_category' => 1,
</span><span class="cx"> 'default_comment_status' => 'open',
</span><del>- 'default_comment_status_page' => 'open',
</del><span class="cx"> 'default_ping_status' => 'open',
</span><span class="cx"> 'default_pingback_flag' => 1,
</span><span class="cx"> 'default_post_edit_rows' => 10,
</span></span></pre></div>
<a id="trunkwpadminoptionsdiscussionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-discussion.php (14649 => 14650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-discussion.php 2010-05-15 04:47:03 UTC (rev 14649)
+++ trunk/wp-admin/options-discussion.php 2010-05-15 04:56:56 UTC (rev 14650)
</span><span class="lines">@@ -42,12 +42,6 @@
</span><span class="cx"> <?php _e('Allow people to post comments on new articles') ?></label>
</span><span class="cx"> <br />
</span><span class="cx"> <small><em><?php echo '(' . __('These settings may be overridden for individual articles.') . ')'; ?></em></small>
</span><del>-<br />
-<label for="default_comment_status_page">
-<input name="default_comment_status_page" type="checkbox" id="default_comment_status_page" value="open" <?php checked('open', get_option('default_comment_status_page')); ?> />
-<?php _e('Allow people to post comments on new pages') ?></label>
-<br />
-<small><em><?php echo '(' . __('These settings may be overridden for individual pages.') . ')'; ?></em></small>
</del><span class="cx"> </fieldset></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <tr valign="top">
</span></span></pre></div>
<a id="trunkwpadminoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options.php (14649 => 14650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options.php 2010-05-15 04:47:03 UTC (rev 14649)
+++ trunk/wp-admin/options.php 2010-05-15 04:56:56 UTC (rev 14650)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> $whitelist_options = array(
</span><span class="cx"> 'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string' ),
</span><del>- 'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status_page', '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' ),
</del><ins>+ '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' ),
</ins><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><span class="cx"> 'privacy' => array( 'blog_public' ),
</span><span class="cx"> 'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'blog_charset', 'show_on_front', 'page_on_front', 'page_for_posts' ),
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (14649 => 14650)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-05-15 04:47:03 UTC (rev 14649)
+++ trunk/wp-includes/post.php 2010-05-15 04:56:56 UTC (rev 14650)
</span><span class="lines">@@ -2252,11 +2252,7 @@
</span><span class="cx"> if ( $update )
</span><span class="cx"> $comment_status = 'closed';
</span><span class="cx"> else
</span><del>- if ( 'page' == $post_type ) {
- $comment_status = get_option( 'default_comment_status_page' );
- } else {
- $comment_status = get_option( 'default_comment_status' );
- }
</del><ins>+ $comment_status = get_option('default_comment_status');
</ins><span class="cx"> }
</span><span class="cx"> if ( empty($ping_status) )
</span><span class="cx"> $ping_status = get_option('default_ping_status');
</span></span></pre>
</div>
</div>
</body>
</html>