Ticket #42578: 42578.diff

src/wp-includes/default-filters.php

@@ -114 +114 @@
 }
 
 // Format text area for display.
-foreach ( array( 'term_description', 'get_the_author_description', 'get_the_post_type_description' ) as $filter ) {
+foreach ( array( 'term_description', 'get_the_author_description' ) as $filter ) {
         add_filter( $filter, 'wptexturize'      );
         add_filter( $filter, 'convert_chars'    );
         add_filter( $filter, 'wpautop'          );

src/wp-includes/general-template.php

@@ -1554 +1554 @@
         if ( is_author() ) {
                 $description = get_the_author_meta( 'description' );
         } elseif ( is_post_type_archive() ) {
-                $description = get_the_post_type_description();
+                $post_type = get_query_var( 'post_type' ); 
+
+                if ( is_array( $post_type ) ) { 
+                        $post_type = reset( $post_type );
+                }
+
+                $post_type_obj = get_post_type_object( $post_type ); 
+          
+        // Check if a description is set.
+        if ( isset( $post_type_obj->description ) ) {
+                $description = $post_type_obj->description;
+        } else {
+                $description = '';
+        } 
         } else {
                 $description = term_description();
         }
@@ -1570 +1583 @@
 }
 
 /**
- * Retrieves the description for a post type archive.
- *
- * @since 4.9.0
- *
- * @return string The post type description.
- */
-function get_the_post_type_description() {
-        $post_type = get_query_var( 'post_type' );
-
-        if ( is_array( $post_type ) ) {
-                $post_type = reset( $post_type );
-        }
-
-        $post_type_obj = get_post_type_object( $post_type );
-
-        // Check if a description is set.
-        if ( isset( $post_type_obj->description ) ) {
-                $description = $post_type_obj->description;
-        } else {
-                $description = '';
-        }
-
-        /**
-         * Filters the description for a post type archive.
-         *
-         * @since 4.9.0
-         *
-         * @param string       $description   The post type description.
-         * @param WP_Post_Type $post_type_obj The post type object.
-         */
-        return apply_filters( 'get_the_post_type_description', $description, $post_type_obj );
-}
-
-/**
  * Retrieve archive link content based on predefined or custom code.
  *
  * The format can be one of four styles. The 'link' for head element, 'option'