Changeset 33122

Timestamp:

07/08/2015 03:43:24 PM (9 years ago)

Author:

helen

Message:

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

props nacin.
see #31168.

Location:

trunk/src/wp-includes

Files:

• comment.php (modified) (1 diff)
• post.php (modified) (1 diff)

trunk/src/wp-includes/comment.php

@@ -1035 +1035 @@
 
 /**
+ * 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.
  *

trunk/src/wp-includes/post.php

@@ -4076 +4076 @@
 
 /**
- * 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.
  *