Changeset 5004

Timestamp:

02/24/2017 07:46:02 PM (8 years ago)

Author:

coffee2code

Message:

Support Theme: Show notice indicating a flagged user even if the moderator who flagged them isn't known.

See #2493.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support

Files:

• bbpress/user-profile.php (modified) (1 diff)
• functions.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/user-profile.php

@@ -17 +17 @@
             $moderator       = get_user_meta( bbp_get_displayed_user_id(), '_wporg_bbp_moderator', true );
 
-            if ( $is_user_flagged && $moderator ) {
+            if ( $is_user_flagged ) {
+                if ( $moderator ) {
+                    /* translators: %s: moderator's username */
+                    $msg = sprintf( __( 'This user has been flagged by %s.', 'wporg-forums' ), $moderator );
+                } else {
+                    $msg = __( 'This user has been flagged.', 'wporg-forums' );
+                }
+
                 printf(
                     '<div class="bbp-template-notice info"><p>%s</p></div>',
-                    /* translators: %s: moderator's username */
-                    sprintf( __( 'This user has been flagged by %s.', 'wporg-forums' ), $moderator )
+                    $msg
                 );
             }

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php

@@ -275 +275 @@
             $moderator       = get_user_meta( get_post()->post_author, '_wporg_bbp_moderator', true );
 
-            if ( $is_user_flagged && $moderator ) {
-                /* translators: %s: moderator's username */
-                $notices[] = sprintf( __( 'This user has been flagged by %s.', 'wporg-forums' ), $moderator );
+            if ( $is_user_flagged ) {
+                if ( $moderator ) {
+                    /* translators: %s: moderator's username */
+                    $notices[] = sprintf( __( 'This user has been flagged by %s.', 'wporg-forums' ), $moderator );
+                } else {
+                    $notices[] = __( 'This user has been flagged.', 'wporg-forums' );
+                }
             }
         endif;