Changeset 3648

Timestamp:

12/28/2011 06:30:22 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Fall back on user_login, and lastly "Anonymous" if no name is found anywhere. Fixes #1704.

Location:

branches/plugin/bbp-includes

Files:

• bbp-reply-template.php (modified) (1 diff)
• bbp-topic-template.php (modified) (1 diff)

branches/plugin/bbp-includes/bbp-reply-template.php

@@ -868 +868 @@
         $reply_id = bbp_get_reply_id( $reply_id );
 
-        // Check for anonymous user
-        if ( !bbp_is_reply_anonymous( $reply_id ) )
+        // User is not a guest
+        if ( !bbp_is_reply_anonymous( $reply_id ) ) {
+
+            // Try to get a display name
             $author_name = get_the_author_meta( 'display_name', bbp_get_reply_author_id( $reply_id ) );
-        else
+
+            // Fall back to user login
+            if ( empty( $author_name ) ) {
+                $author_name = get_the_author_meta( 'user_login', bbp_get_reply_author_id( $reply_id ) );
+            }
+
+        // User does not have an account
+        } else {
             $author_name = get_post_meta( $reply_id, '_bbp_anonymous_name', true );
+        }
+
+        // If nothing could be found anywhere, use Anonymous
+        if ( empty( $author_name ) )
+            $author_name = __( 'Anonymous', 'bbpress' );
 
         return apply_filters( 'bbp_get_reply_author_display_name', esc_attr( $author_name ), $reply_id );

branches/plugin/bbp-includes/bbp-topic-template.php

@@ -1135 +1135 @@
 
         // Check for anonymous user
-        if ( !bbp_is_topic_anonymous( $topic_id ) )
+        if ( !bbp_is_topic_anonymous( $topic_id ) ) {
+
+            // Try to get a display name
             $author_name = get_the_author_meta( 'display_name', bbp_get_topic_author_id( $topic_id ) );
-        else
+
+            // Fall back to user login
+            if ( empty( $author_name ) ) {
+                $author_name = get_the_author_meta( 'user_login', bbp_get_reply_author_id( $topic_id ) );
+            }
+
+        // User does not have an account
+        } else {
             $author_name = get_post_meta( $topic_id, '_bbp_anonymous_name', true );
-
-        return apply_filters( 'bbp_get_topic_author_id', esc_attr( $author_name ), $topic_id );
+        }
+
+        // If nothing could be found anywhere, use Anonymous
+        if ( empty( $author_name ) )
+            $author_name = __( 'Anonymous', 'bbpress' );
+
+        return apply_filters( 'bbp_get_topic_author_display_name', esc_attr( $author_name ), $topic_id );
     }