<!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>[33041] trunk: Turn of comments for pages by default.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/33041">33041</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/33041","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>obenland</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-07-02 00:21:28 +0000 (Thu, 02 Jul 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Turn of comments for pages by default.
Pages are static content, for which comments are not expected out of the box.
Props valendesigns, rachelbaker.
Fixes <a href="https://core.trac.wordpress.org/ticket/31168">#31168</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunktestsphpunittestspostphp">trunk/tests/phpunit/tests/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2015-07-01 23:35:57 UTC (rev 33040)
+++ trunk/src/wp-includes/post.php 2015-07-02 00:21:28 UTC (rev 33041)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3127,11 +3127,25 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_id = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $defaults = array('post_status' => 'draft', 'post_type' => 'post', 'post_author' => $user_id,
- 'ping_status' => get_option('default_ping_status'), 'post_parent' => 0,
- 'menu_order' => 0, 'to_ping' => '', 'pinged' => '', 'post_password' => '',
- 'guid' => '', 'post_content_filtered' => '', 'post_excerpt' => '', 'import_id' => 0,
- 'post_content' => '', 'post_title' => '', 'context' => '');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $defaults = array(
+ 'post_author' => $user_id,
+ 'post_content' => '',
+ 'post_content_filtered' => '',
+ 'post_title' => '',
+ 'post_excerpt' => '',
+ 'post_status' => 'draft',
+ 'post_type' => 'post',
+ 'comment_status' => '',
+ 'ping_status' => '',
+ 'post_password' => '',
+ 'to_ping' => '',
+ 'pinged' => '',
+ 'post_parent' => 0,
+ 'menu_order' => 0,
+ 'guid' => '',
+ 'import_id' => 0,
+ 'context' => '',
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $postarr = wp_parse_args($postarr, $defaults);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3302,11 +3316,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Comment status.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $postarr['comment_status'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $update ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_status = 'closed';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_status = get_option('default_comment_status');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_status = get_default_comment_status( $post_type );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_status = $postarr['comment_status'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3315,7 +3330,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // These variables are needed by compact() later.
</span><span class="cx" style="display: block; padding: 0 10px"> $post_content_filtered = $postarr['post_content_filtered'];
</span><span class="cx" style="display: block; padding: 0 10px"> $post_author = empty( $postarr['post_author'] ) ? $user_id : $postarr['post_author'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ping_status = empty( $postarr['ping_status'] ) ? get_option( 'default_ping_status' ) : $postarr['ping_status'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ping_status = empty( $postarr['ping_status'] ) ? get_default_comment_status( $post_type, 'pingback' ) : $postarr['ping_status'];
</ins><span class="cx" style="display: block; padding: 0 10px"> $to_ping = isset( $postarr['to_ping'] ) ? sanitize_trackback_urls( $postarr['to_ping'] ) : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $pinged = isset( $postarr['pinged'] ) ? $postarr['pinged'] : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $import_id = isset( $postarr['import_id'] ) ? $postarr['import_id'] : 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4056,10 +4071,52 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> //
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Trackback and ping functions
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// Comment, trackback, and pingback functions.
</ins><span class="cx" style="display: block; padding: 0 10px"> //
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Get the default comment status for a post type.
+ *
+ * @since 4.3.0
+ *
+ * @param string $post_type Optional. Post type. Default 'post'.
+ * @param string $comment_type Optional. Comment type. Default 'comment'.
+ * @return string Expected return value is 'open' or 'closed'.
+ */
+function get_default_comment_status( $post_type = 'post', $comment_type = 'comment' ) {
+ switch ( $comment_type ) {
+ case 'pingback' :
+ case 'trackback' :
+ $supports = 'trackbacks';
+ $option = 'ping';
+ break;
+ default :
+ $supports = 'comments';
+ $option = 'comment';
+ }
+
+ // Set the status.
+ if ( 'page' === $post_type ) {
+ $status = 'closed';
+ } elseif ( post_type_supports( $post_type, $supports ) ) {
+ $status = get_option( "default_{$option}_status" );
+ } else {
+ $status = 'closed';
+ }
+
+ /**
+ * Filter the default comment status for the given post type.
+ *
+ * @since 4.3.0
+ *
+ * @param string $status Default status for the given post type,
+ * either 'open' or 'closed'.
+ * @param string $comment_type Type of comment. Default is `comment`.
+ */
+ return apply_filters( "get_{$post_type}_default_comment_status", $status, $comment_type );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Add a URL to those already pinged.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span></span></pre></div>
<a id="trunktestsphpunittestspostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post.php 2015-07-01 23:35:57 UTC (rev 33040)
+++ trunk/tests/phpunit/tests/post.php 2015-07-02 00:21:28 UTC (rev 33041)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -950,4 +950,77 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $value, $post->$field );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 31168
+ */
+ function test_wp_insert_post_default_comment_ping_status_open() {
+ $post_id = $this->factory->post->create( array(
+ 'post_author' => $this->author_id,
+ 'post_status' => 'public',
+ 'post_content' => rand_str(),
+ 'post_title' => rand_str(),
+ ) );
+ $post = get_post( $post_id );
+
+ $this->assertEquals( 'open', $post->comment_status );
+ $this->assertEquals( 'open', $post->ping_status );
+ }
+
+ /**
+ * @ticket 31168
+ */
+ function test_wp_insert_post_page_default_comment_ping_status_closed() {
+ $post_id = $this->factory->post->create( array(
+ 'post_author' => $this->author_id,
+ 'post_status' => 'public',
+ 'post_content' => rand_str(),
+ 'post_title' => rand_str(),
+ 'post_type' => 'page',
+ ) );
+ $post = get_post( $post_id );
+
+ $this->assertEquals( 'closed', $post->comment_status );
+ $this->assertEquals( 'closed', $post->ping_status );
+ }
+
+ /**
+ * @ticket 31168
+ */
+ function test_wp_insert_post_cpt_default_comment_ping_status_open() {
+ $post_type = rand_str(20);
+ register_post_type( $post_type, array( 'supports' => array( 'comments', 'trackbacks' ) ) );
+ $post_id = $this->factory->post->create( array(
+ 'post_author' => $this->author_id,
+ 'post_status' => 'public',
+ 'post_content' => rand_str(),
+ 'post_title' => rand_str(),
+ 'post_type' => $post_type,
+ ) );
+ $post = get_post( $post_id );
+
+ $this->assertEquals( 'open', $post->comment_status );
+ $this->assertEquals( 'open', $post->ping_status );
+ _unregister_post_type( $post_type );
+ }
+
+ /**
+ * @ticket 31168
+ */
+ function test_wp_insert_post_cpt_default_comment_ping_status_closed() {
+ $post_type = rand_str(20);
+ register_post_type( $post_type );
+ $post_id = $this->factory->post->create( array(
+ 'post_author' => $this->author_id,
+ 'post_status' => 'public',
+ 'post_content' => rand_str(),
+ 'post_title' => rand_str(),
+ 'post_type' => $post_type,
+ ) );
+ $post = get_post( $post_id );
+
+ $this->assertEquals( 'closed', $post->comment_status );
+ $this->assertEquals( 'closed', $post->ping_status );
+ _unregister_post_type( $post_type );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>