Changeset 25136

Timestamp:

08/27/2013 01:16:34 PM (13 years ago)

Author:

nacin

Message:

Ensure a user exists in get_comment_author().

props azaozz.
see #24084.

File:

• trunk/src/wp-includes/comment-template.php (modified) (1 diff)

trunk/src/wp-includes/comment-template.php

@@ -23 +23 @@
 function get_comment_author( $comment_ID = 0 ) {
         $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 {
+
+        if ( empty( $comment->comment_author ) ) {
+                if ( $comment->user_id && $user = get_userdata( $comment->user_id ) )
+                        $author = $user->display_name;
+                else
                         $author = __('Anonymous');
-                }
         } else {
                 $author = $comment->comment_author;
         }
-        return apply_filters('get_comment_author', $author);
+
+        return apply_filters( 'get_comment_author', $author );
 }