Ticket #34362: 34362.diff

src/wp-includes/comment-template.php

@@ -1029 +1029 @@
 }
 
 /**
- * Display the comment type of the current comment.
+ * Generates a display name for the comment type of the current comment.
  *
  * @since 0.71
  *
  * @param string $commenttxt   Optional. String to display for comment type. Default false.
  * @param string $trackbacktxt Optional. String to display for trackback type. Default false.
  * @param string $pingbacktxt  Optional. String to display for pingback type. Default false.
+ * @param bool   $echo         Optional. Whether to echo or return the output. Default true.
+ * @return string|null         Null when echo is truthy (default), a string otherwise
  */
-function comment_type( $commenttxt = false, $trackbacktxt = false, $pingbacktxt = false ) {
-        if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
-        if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
-        if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
+function comment_type(
+        $commenttxt = false,
+        $trackbacktxt = false,
+        $pingbacktxt = false,
+        $echo = true
+) {
+
         $type = get_comment_type();
         switch( $type ) {
                 case 'trackback' :
-                        echo $trackbacktxt;
+                        if ( false === $trackbacktxt ) {
+                                $display_name = __( 'Trackback' );
+                        } else {
+                                $display_name = $trackbacktxt;
+                        }
                         break;
                 case 'pingback' :
-                        echo $pingbacktxt;
+                        if ( false === $pingbacktxt ) {
+                                $display_name = __( 'Pingback' );
+                        } else {
+                                $display_name = $pingbacktxt;
+                        }
                         break;
                 default :
-                        echo $commenttxt;
+                        if ( false === $commenttxt ) {
+                                $display_name = _x( 'Comment', 'noun' );
+                        } else {
+                                $display_name = $commenttxt;
+                        }
+        }
+
+        $display_name = apply_filters( 'comment_type_display_name', $display_name );
+
+        if ($echo) {
+                echo $display_name;
+        } else {
+                return $display_name;
         }
 }