Changeset 6583 for trunk/src/includes/core/template-functions.php

Timestamp:

06/19/2017 04:29:43 AM (9 years ago)

Author:

johnjamesjacoby

Message:

Better 404 handling:

• Introduce bbp_is_404 query var, and set this in places where the default 404 condition needs to be overridden
• Introduce bbp_set_200() for cases where a default of 404 needs to be set to a 200
• Introduce bbp_get_wp_query() helper for getting the $wp_query global
• Update bbp_set_404() to accept a $query parameter to make passing the query around easier
• Update child-ids queries to use the last_changed cache to reduce the amount of cache churn when cleaning

Fixes #3047. See #1973.

File:

• trunk/src/includes/core/template-functions.php (modified) (7 diffs)

trunk/src/includes/core/template-functions.php

@@ -532 +532 @@
                 // 404 and bail if user does not have a profile
                 if ( empty( $the_user->ID ) || ! bbp_user_has_profile( $the_user->ID ) ) {
-                        $posts_query->set_404();
+                        $posts_query->bbp_is_404 = true;
                         return;
                 }
@@ -593 +593 @@
                 }
 
+                // Make sure 404 is not set
+                $posts_query->is_404  = false;
+
+                // Correct is_home variable
+                $posts_query->is_home = false;
+
                 // Looking at a single user
                 $posts_query->bbp_is_single_user = true;
 
-                // Make sure 404 is not set
-                $posts_query->is_404  = false;
-
-                // Correct is_home variable
-                $posts_query->is_home = false;
+                // User found so don't 404 yet
+                $posts_query->bbp_is_404 = false;
 
                 // User is looking at their own profile
@@ -621 +624 @@
                 // Bail if view args is false (view isn't registered)
                 if ( false === $view_args ) {
-                        $posts_query->set_404();
+                        $posts_query->bbp_is_404 = true;
                         return;
                 }
@@ -630 +633 @@
                 // We are in a custom topic view
                 $posts_query->bbp_is_view = true;
+
+                // No 404 because views are all (currently) public
+                $posts_query->bbp_is_404 = false;
 
         // Search Page
@@ -646 +652 @@
                 $posts_query->bbp_is_search = true;
 
+                // No 404 because search is always public
+                $posts_query->bbp_is_404 = false;
+
         // Forum/Topic/Reply Edit Page
         } elseif ( ! empty( $is_edit ) ) {
@@ -654 +663 @@
                 // Check which post_type we are editing, if any
                 if ( ! empty( $post_type ) ) {
-                        switch( $post_type ) {
+                        switch ( $post_type ) {
 
                                 // We are editing a forum
                                 case bbp_get_forum_post_type() :
-                                        $posts_query->bbp_is_forum_edit = true;
-                                        $posts_query->bbp_is_edit       = true;
+                                        $posts_query->bbp_is_forum_edit  = true;
+                                        $posts_query->bbp_is_edit        = true;
+                                        $posts_query->bbp_is_404         = false;
                                         break;
 
                                 // We are editing a topic
                                 case bbp_get_topic_post_type() :
-                                        $posts_query->bbp_is_topic_edit = true;
-                                        $posts_query->bbp_is_edit       = true;
+                                        $posts_query->bbp_is_topic_edit  = true;
+                                        $posts_query->bbp_is_edit        = true;
+                                        $posts_query->bbp_is_404         = false;
                                         break;
 
                                 // We are editing a reply
                                 case bbp_get_reply_post_type() :
-                                        $posts_query->bbp_is_reply_edit = true;
-                                        $posts_query->bbp_is_edit       = true;
+                                        $posts_query->bbp_is_reply_edit  = true;
+                                        $posts_query->bbp_is_edit        = true;
+                                        $posts_query->bbp_is_404         = false;
                                         break;
                         }
@@ -679 +691 @@
                         $posts_query->bbp_is_topic_tag_edit = true;
                         $posts_query->bbp_is_edit           = true;
+                        $posts_query->bbp_is_404            = false;
                 }