Changeset 5625 for sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-support-compat.php

Timestamp:

07/07/2017 05:38:42 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Support Forums: Add rewrite rules and parse query arguments for user's "Active Topics" and "Topics Replied To" views.

Move user's "Reviews Written" view handling to Users class.

See #2470.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-support-compat.php (modified) (5 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-support-compat.php

@@ -30 +30 @@
                         add_filter( 'bbp_request', array( $this, 'request' ), 9 );
 
-                        // Add views for plugin committer/contributor.
+                        // Add query vars and rewrite rules for plugin committer/contributor.
                         add_filter( 'query_vars',            array( $this, 'add_query_var' ) );
                         add_action( 'bbp_add_rewrite_rules', array( $this, 'add_rewrite_rules' ) );
@@ -37 +37 @@
                         // on parse_query at priority 2.
                         add_action( 'parse_query',           array( $this, 'parse_query' ), 0 );
-
-                        // Parse user's reviews query.
-                        add_action( 'parse_query',                     array( $this, 'parse_user_reviews_query' ) );
-                        add_filter( 'bbp_after_has_topics_parse_args', array( $this, 'parse_user_reviews_query_args' ) );
-                        add_filter( 'bbp_topic_pagination',            array( $this, 'parse_user_reviews_pagination_args' ) );
-                        add_filter( 'bbp_before_title_parse_args',     array( $this, 'parse_user_reviews_title_args' ) );
 
                         // Exclude compat forums from forum dropdown.
@@ -215 +209 @@
 
         /**
-         * Set WP_Query::bbp_is_single_user_profile to false on user's reviews page.
-         *
-         * @param WP_Query $query Current query object.
-         */
-        public function parse_user_reviews_query( $query ) {
-                if ( get_query_var( 'wporg_single_user_reviews' ) ) {
-                        $query->bbp_is_single_user_profile = false;
-                }
-        }
-
-        /**
-         * Set forum ID for user's reviews query.
-         *
-         * @param array $args WP_Query arguments.
-         * @return array Filtered query arguments.
-         */
-        public function parse_user_reviews_query_args( $args ) {
-                if ( get_query_var( 'wporg_single_user_reviews' ) ) {
-                        $args['post_parent'] = Plugin::REVIEWS_FORUM_ID;
-                } elseif ( bbp_is_single_user_topics() ) {
-                        $args['post_parent__not_in'] = array( Plugin::REVIEWS_FORUM_ID );
-                }
-
-                return $args;
-        }
-
-        /**
-         * Set 'base' argument for pagination links on user's reviews page.
-         *
-         * @param array $args Pagination arguments.
-         * @return array Filtered pagination arguments.
-         */
-        public function parse_user_reviews_pagination_args( $args ) {
-                if ( get_query_var( 'wporg_single_user_reviews' ) ) {
-                        $args['base']  = bbp_get_user_profile_url( bbp_get_displayed_user_id() ) . 'reviews/';
-                        $args['base'] .= bbp_get_paged_slug() . '/%#%/';
-                }
-
-                return $args;
-        }
-
-        /**
-         * Set title for user's reviews page.
-         *
-         * @param array $title Title parts.
-         * @return array Filtered title parts.
-         */
-        public function parse_user_reviews_title_args( $title ) {
-                if ( get_query_var( 'wporg_single_user_reviews' ) ) {
-                        if ( bbp_is_user_home() ) {
-                                $title['text'] = __( 'Your Reviews', 'wporg-forums' );
-                        } else {
-                                $title['text'] = get_userdata( bbp_get_user_id() )->display_name;
-                                /* translators: user's display name */
-                                $title['format'] = __( "%s's Reviews", 'wporg-forums' );
-                        }
-                }
-
-                return $title;
-        }
-
+         * Add query vars for plugin committer/contributor views.
+         *
+         * @param array $query_vars Query vars.
+         * @return array Filtered query vars.
+         */
         public function add_query_var( $query_vars ) {
                 $query_vars[] = 'wporg_user_login';
-                $query_vars[] = 'wporg_single_user_reviews';
                 return $query_vars;
         }
 
+        /**
+         * Add rewrite rules for plugin committer/contributor views.
+         */
         public function add_rewrite_rules() {
                 $priority   = 'top';
@@ -287 +227 @@
                 $plugin_committer_rule   = bbp_get_view_slug() . '/plugin-committer/([^/]+)/';
                 $plugin_contributor_rule = bbp_get_view_slug() . '/plugin-contributor/([^/]+)/';
-                $user_reviews_rule       = bbp_get_user_slug() . '/([^/]+)/reviews/';
 
                 $feed_id    = 'feed';
                 $view_id    = bbp_get_view_rewrite_id();
-                $user_id    = bbp_get_user_rewrite_id();
                 $paged_id   = bbp_get_paged_rewrite_id();
 
@@ -310 +248 @@
                 add_rewrite_rule( $plugin_contributor_rule . $paged_rule, 'index.php?' . $view_id . '=plugin-contributor&wporg_user_login=$matches[1]&' . $paged_id . '=$matches[2]', $priority );
                 add_rewrite_rule( $plugin_contributor_rule . $feed_rule,  'index.php?' . $view_id . '=plugin-contributor&wporg_user_login=$matches[1]&' . $feed_id  . '=$matches[2]', $priority );
-
-                // Add user's reviews rewrite rules.
-                add_rewrite_rule( $user_reviews_rule . $base_rule,  'index.php?' . $user_id . '=$matches[1]&wporg_single_user_reviews=1',                               $priority );
-                add_rewrite_rule( $user_reviews_rule . $paged_rule, 'index.php?' . $user_id . '=$matches[1]&wporg_single_user_reviews=1&' . $paged_id . '=$matches[2]', $priority );
-                add_rewrite_rule( $user_reviews_rule . $feed_rule,  'index.php?' . $user_id . '=$matches[1]&wporg_single_user_reviews=1&' . $feed_id  . '=$matches[2]', $priority );
         }