Changeset 7132

Timestamp:

05/30/2013 11:00:12 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Improvements to bp_theme_compat_reset_post() to use WP_Post class. See #5021.

File:

• trunk/bp-core/bp-core-theme-compatibility.php (modified) (4 diffs)

trunk/bp-core/bp-core-theme-compatibility.php

@@ -337 +337 @@
     }
 }
+
 /**
  * This fun little function fills up some WordPress globals with dummy data to
@@ -349 +350 @@
     global $wp_query, $post;
 
-    // Default arguments
-    $defaults = array(
-        'ID'                    => -9999,
-        'post_status'           => 'publish',
-        'post_author'           => 0,
-        'post_parent'           => 0,
-        'post_type'             => 'page',
-        'post_date'             => 0,
-        'post_date_gmt'         => 0,
-        'post_modified'         => 0,
-        'post_modified_gmt'     => 0,
-        'post_content'          => '',
-        'post_title'            => '',
-        'post_category'         => 0,
-        'post_excerpt'          => '',
-        'post_content_filtered' => '',
-        'post_mime_type'        => '',
-        'post_password'         => '',
-        'post_name'             => '',
-        'guid'                  => '',
-        'menu_order'            => 0,
-        'pinged'                => '',
-        'to_ping'               => '',
-        'ping_status'           => '',
-        'comment_status'        => 'closed',
-        'comment_count'         => 0,
-
-        'is_404'          => false,
-        'is_page'         => false,
-        'is_single'       => false,
-        'is_archive'      => false,
-        'is_tax'          => false,
-    );
-
     // Switch defaults if post is set
     if ( isset( $wp_query->post ) ) {
-        $defaults = array(
+        $dummy = bbp_parse_args( $args, array(
             'ID'                    => $wp_query->post->ID,
             'post_status'           => $wp_query->post->post_status,
@@ -409 +376 @@
             'comment_status'        => $wp_query->post->comment_status,
             'comment_count'         => $wp_query->post->comment_count,
-
-            'is_404'          => false,
-            'is_page'         => false,
-            'is_single'       => false,
-            'is_archive'      => false,
-            'is_tax'          => false,
-        );
-    }
-    $dummy = wp_parse_args( $args, $defaults ); //, 'theme_compat_reset_post' );
-
-    // Clear out the post related globals
-    unset( $wp_query->posts );
-    unset( $wp_query->post  );
-    unset( $post            );
-
-    // Setup the dummy post object
-    $wp_query->post                        = new stdClass;
-    $wp_query->post->ID                    = $dummy['ID'];
-    $wp_query->post->post_status           = $dummy['post_status'];
-    $wp_query->post->post_author           = $dummy['post_author'];
-    $wp_query->post->post_parent           = $dummy['post_parent'];
-    $wp_query->post->post_type             = $dummy['post_type'];
-    $wp_query->post->post_date             = $dummy['post_date'];
-    $wp_query->post->post_date_gmt         = $dummy['post_date_gmt'];
-    $wp_query->post->post_modified         = $dummy['post_modified'];
-    $wp_query->post->post_modified_gmt     = $dummy['post_modified_gmt'];
-    $wp_query->post->post_content          = $dummy['post_content'];
-    $wp_query->post->post_title            = $dummy['post_title'];
-    $wp_query->post->post_excerpt          = $dummy['post_excerpt'];
-    $wp_query->post->post_content_filtered = $dummy['post_content_filtered'];
-    $wp_query->post->post_mime_type        = $dummy['post_mime_type'];
-    $wp_query->post->post_password         = $dummy['post_password'];
-    $wp_query->post->post_name             = $dummy['post_name'];
-    $wp_query->post->guid                  = $dummy['guid'];
-    $wp_query->post->menu_order            = $dummy['menu_order'];
-    $wp_query->post->pinged                = $dummy['pinged'];
-    $wp_query->post->to_ping               = $dummy['to_ping'];
-    $wp_query->post->ping_status           = $dummy['ping_status'];
-    $wp_query->post->comment_status        = $dummy['comment_status'];
-    $wp_query->post->comment_count         = $dummy['comment_count'];
+            'filter'                => $wp_query->post->filter,
+
+            'is_404'                => false,
+            'is_page'               => false,
+            'is_single'             => false,
+            'is_archive'            => false,
+            'is_tax'                => false,
+        ) );
+    } else {
+        $dummy = wp_parse_args( $args, array(
+            'ID'                    => -9999,
+            'post_status'           => bbp_get_public_status_id(),
+            'post_author'           => 0,
+            'post_parent'           => 0,
+            'post_type'             => 'page',
+            'post_date'             => 0,
+            'post_date_gmt'         => 0,
+            'post_modified'         => 0,
+            'post_modified_gmt'     => 0,
+            'post_content'          => '',
+            'post_title'            => '',
+            'post_excerpt'          => '',
+            'post_content_filtered' => '',
+            'post_mime_type'        => '',
+            'post_password'         => '',
+            'post_name'             => '',
+            'guid'                  => '',
+            'menu_order'            => 0,
+            'pinged'                => '',
+            'to_ping'               => '',
+            'ping_status'           => '',
+            'comment_status'        => 'closed',
+            'comment_count'         => 0,
+            'filter'                => 'raw',
+
+            'is_404'                => false,
+            'is_page'               => false,
+            'is_single'             => false,
+            'is_archive'            => false,
+            'is_tax'                => false,
+        ) );
+    }
+
+    // Bail if dummy post is empty
+    if ( empty( $dummy ) ) {
+        return;
+    }
 
     // Set the $post global
-    $post = $wp_query->post;
-
-    // Setup the dummy post loop
-    $wp_query->posts[0] = $wp_query->post;
+    $post = new WP_Post( (object) $dummy );
+
+    // Copy the new post global into the main $wp_query
+    $wp_query->post       = $post;
+    $wp_query->posts      = array( $post );
 
     // Prevent comments form from appearing
@@ -464 +439 @@
     $wp_query->is_tax     = $dummy['is_tax'];
 
+    // Clean up the dummy post
+    unset( $dummy );
+
+    /**
+     * Force the header back to 200 status if not a deliberate 404
+     *
+     * @see http://bbpress.trac.wordpress.org/ticket/1973
+     */
+    if ( ! $wp_query->is_404() ) {
+        status_header( 200 );
+    }
+
     // If we are resetting a post, we are in theme compat
-    bp_set_theme_compat_active();
+    bp_set_theme_compat_active( true );
 }