Changeset 5957 for sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-moderation/inc/class-plugin.php

Timestamp:

09/22/2017 07:03:13 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Support Forums, User Moderation: Display a notice indicating that a post is being held for moderation to non-flagged users as well.

Amends [4216] to always display the notice when appropriate.

Fixes #2966.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-moderation/inc/class-plugin.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-user-moderation/inc/class-plugin.php

@@ -63 +63 @@
                         add_filter( 'bbp_new_reply_pre_insert',  array( $this, 'pre_insert' ) );
                         add_filter( 'bbp_edit_reply_pre_insert', array( $this, 'pre_insert' ) );
-
-                        // Alter queries for moderated users.
-                        add_filter( 'posts_where', array( $this, 'posts_where' ) );
-                }
+                }
+
+                // Alter queries for the current user.
+                add_filter( 'posts_where', array( $this, 'posts_where' ) );
 
                 // Add views and actions for moderators.
@@ -95 +95 @@
 
         /**
-         * Adjust the query for moderated users.
+         * Adjust the query for the current user.
          */
         public function posts_where( $where ) {
@@ -106 +106 @@
                         ) {
                                 $original = $wpdb->prepare( "$wpdb->posts.post_status = %s OR ", bbp_get_public_status_id() );
-                                $replacement = $wpdb->prepare( " ( $wpdb->posts.post_status = '%s' AND $wpdb->posts.post_author = '%d' ) OR ", bbp_get_pending_status_id(), get_current_user_id() );
+                                $replacement = $wpdb->prepare( " ( $wpdb->posts.post_status IN ( %s, %s ) AND $wpdb->posts.post_author = '%d' ) OR ",
+                                        bbp_get_pending_status_id(),
+                                        bbp_get_spam_status_id(),
+                                        get_current_user_id()
+                                );
                                 $where = str_replace( $original, $original . $replacement, $where );
                         }