WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move `get_default_comment_status()` to `wp-includes/comment.php` to sit alongside `get_comment_statuses()`. 

props nacin.
see #31168.

Built from https://develop.svn.wordpress.org/trunk@33122


git-svn-id: http://core.svn.wordpress.org/trunk@33093 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Helen Hou-Sandí 2015-07-08 15:44:28 +00:00
parent 1276096e3a
commit 30e478b1fb
3 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
wp-includes/comment.php
View File

@ -1033,6 +1033,49 @@ function get_comment_statuses() {
return $status;
}
/**
* 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 $post_type Post type. Default is `post`.
* @param string $comment_type Type of comment. Default is `comment`.
*/
return apply_filters( 'get_default_comment_status' , $status, $post_type, $comment_type );
}
/**
* The date the last comment was modified.
*

43
wp-includes/post.php
View File

@ -4074,49 +4074,6 @@ function wp_transition_post_status( $new_status, $old_status, $post ) {
// Comment, trackback, and pingback functions.
//
/**
* 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 $post_type Post type. Default is `post`.
* @param string $comment_type Type of comment. Default is `comment`.
*/
return apply_filters( 'get_default_comment_status' , $status, $post_type, $comment_type );
}
/**
* Add a URL to those already pinged.
*

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.3-beta1-33121';
$wp_version = '4.3-beta1-33122';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.