Changeset 4898

Timestamp:

02/09/2017 04:11:54 PM (10 years ago)

Author:

SergeyBiryukov

Message:

Support Theme: After [4890], adjust the logic to only show moderation notice for archived posts to moderators.

Fixes #2489. See #2474.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php (modified) (2 diffs)

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

@@ -235 +235 @@
         $is_moderator    = current_user_can( 'moderate' );
         $is_user_blocked = ! current_user_can( 'spectate' );
-
-        if ( in_array( $post_status, array( 'archived', 'pending', 'spam' ) ) ) :
-                $notice_class = $notice = '';
-
-                if ( $is_moderator ) {
-                        if ( 'spam' === $post_status ) {
-                                $notice_class = 'warning';
-
-                                $reporter = get_post_meta( get_the_ID(), '_bbp_akismet_user', true );
-
-                                if ( $reporter ) {
-                                        /* translators: %s: reporter's username */
-                                        $notice = sprintf( __( 'This post has been flagged as spam by %s.', 'wporg-forums' ), $reporter );
-                                } else {
-                                        $notice = __( 'This post has been flagged as spam.', 'wporg-forums' );
-                                }
-                        } elseif ( 'archived' === $post_status ) {
-                                $notice = __( 'This post is currently archived.', 'wporg-forums' );
+        $notice_class    = '';
+        $notice          = '';
+
+        if ( $is_moderator && in_array( $post_status, array( 'archived', 'pending', 'spam' ) ) ) :
+
+                if ( 'spam' === $post_status ) {
+                        $notice_class = 'warning';
+
+                        $reporter = get_post_meta( get_the_ID(), '_bbp_akismet_user', true );
+
+                        if ( $reporter ) {
+                                /* translators: %s: reporter's username */
+                                $notice = sprintf( __( 'This post has been flagged as spam by %s.', 'wporg-forums' ), $reporter );
                         } else {
-                                $notice = __( 'This post is currently pending.', 'wporg-forums' );
+                                $notice = __( 'This post has been flagged as spam.', 'wporg-forums' );
                         }
-                } elseif ( $is_user_blocked ) {
+                } elseif ( 'archived' === $post_status ) {
+                        $notice = __( 'This post is currently archived.', 'wporg-forums' );
+                } else {
+                        $notice = __( 'This post is currently pending.', 'wporg-forums' );
+                }
+
+        elseif ( in_array( $post_status, array( 'pending', 'spam' ) ) ) :
+
+                if ( $is_user_blocked ) {
                         // Blocked users get a generic message with no call to action or moderation timeframe.
                         $notice = __( 'This post has been held for moderation by our automated system.', 'wporg-forums' );
@@ -274 +277 @@
                 }
 
-                if ( $notice ) :
-                        printf(
-                                '<div class="bbp-template-notice %s"><p>%s</p></div>',
-                                esc_attr( $notice_class ),
-                                $notice
-                        );
-                endif;
         endif;
+
+        if ( $notice ) {
+                printf(
+                        '<div class="bbp-template-notice %s"><p>%s</p></div>',
+                        esc_attr( $notice_class ),
+                        $notice
+                );
+        }
 }
 add_action( 'bbp_theme_before_topic_content', 'wporg_support_add_moderation_notice' );