Ticket #10653: garyc40-10653.patch

wp-includes/comment-template.php

@@ -20 +20 @@
  * @param int $comment_ID The ID of the comment for which to retrieve the author. Optional.
  * @return string The comment author
  */
-function get_comment_author( $comment_ID = 0 ) {
+function get_comment_author( $comment_ID = 0, $before_alias = null, $after_alias = null ) {     
         $comment = get_comment( $comment_ID );
-        if ( empty($comment->comment_author) ) {
-                if (!empty($comment->user_id)){
-                        $user=get_userdata($comment->user_id);
-                        $author=$user->user_login;
-                } else {
-                        $author = __('Anonymous');
-                }
-        } else {
-                $author = $comment->comment_author;
-        }
+        
+        $author = __( 'Anonymous' );
+        
+        if ( ! empty( $comment->comment_author ) ) {
+                $author = $comment->comment_author;     
+                
+                if ( ! empty( $comment->user_id ) ) {
+                        $user = get_userdata( $comment->user_id );
+                        
+                        if ( $author != $user->display_name ) {
+                                if ( is_null( $before_alias ) ) {
+                                        $before_alias = __(' (Initially posted by ' );
+                                }
+                                
+                                if ( is_null( $after_alias ) ) {
+                                        $after_alias = __(')');
+                                }
+                                
+                                $author = $user->display_name . $before_alias . $author . $after_alias;
+                        } // $author != $user->display_name
+                } // ! empty( $comment->user_id )
+        } // ! empty( $comment->comment_author )
+        
         return apply_filters('get_comment_author', $author);
 }