Ticket #4964: comments-template.patch

wp-includes/comment-template.php

@@ -161 +161 @@
         return apply_filters('get_comments_number', $count);
 }
 
-function comments_number( $zero = false, $one = false, $more = false, $deprecated = '' ) {
+function comments_number( $zero = false, $one = false, $more = false, $number = '' ) {
         global $id;
-        $number = get_comments_number($id);
+        if ( !is_numeric($number) ) $number = get_comments_number($id);
 
         if ( $number > 1 )
                 $output = str_replace('%', $number, ( false === $more ) ? __('% Comments') : $more);
-        elseif ( $number == 0 )
+        elseif ( $number == 1 )
+                $output = ( false === $one ) ? __('1 Comment') : $one;
+        else // must be 0 or something out of range
                 $output = ( false === $zero ) ? __('No Comments') : $zero;
-        else // must be one
-                $output = ( false === $one ) ? __('1 Comment') : $one;
 
         echo apply_filters('comments_number', $output, $number);
 }