<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][7132] trunk/bp-core/bp-core-theme-compatibility.php: Improvements to bp_theme_compat_reset_post() to use WP_Post class.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7132">7132</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2013-05-30 23:00:12 +0000 (Thu, 30 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improvements to bp_theme_compat_reset_post() to use WP_Post class. See <a href="http://buddypress.trac.wordpress.org/ticket/5021">#5021</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorethemecompatibilityphp">trunk/bp-core/bp-core-theme-compatibility.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorethemecompatibilityphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-theme-compatibility.php (7131 => 7132)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-theme-compatibility.php 2013-05-30 22:58:46 UTC (rev 7131)
+++ trunk/bp-core/bp-core-theme-compatibility.php 2013-05-30 23:00:12 UTC (rev 7132)
</span><span class="lines">@@ -336,6 +336,7 @@
</span><span class="cx"> $bp->theme_compat->packages[$theme->id] = $theme;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * This fun little function fills up some WordPress globals with dummy data to
</span><span class="cx"> * stop your average page template from complaining about it missing.
</span><span class="lines">@@ -348,43 +349,9 @@
</span><span class="cx"> function bp_theme_compat_reset_post( $args = array() ) {
</span><span class="cx"> global $wp_query, $post;
</span><span class="cx">
</span><del>- // 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,
- );
-
</del><span class="cx"> // Switch defaults if post is set
</span><span class="cx"> if ( isset( $wp_query->post ) ) {
</span><del>- $defaults = array(
</del><ins>+ $dummy = bbp_parse_args( $args, array(
</ins><span class="cx"> 'ID' => $wp_query->post->ID,
</span><span class="cx"> 'post_status' => $wp_query->post->post_status,
</span><span class="cx"> 'post_author' => $wp_query->post->post_author,
</span><span class="lines">@@ -408,52 +375,60 @@
</span><span class="cx"> 'ping_status' => $wp_query->post->ping_status,
</span><span class="cx"> 'comment_status' => $wp_query->post->comment_status,
</span><span class="cx"> 'comment_count' => $wp_query->post->comment_count,
</span><ins>+ 'filter' => $wp_query->post->filter,
</ins><span class="cx">
</span><del>- 'is_404' => false,
- 'is_page' => false,
- 'is_single' => false,
- 'is_archive' => false,
- 'is_tax' => false,
- );
</del><ins>+ '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,
+ ) );
</ins><span class="cx"> }
</span><del>- $dummy = wp_parse_args( $args, $defaults ); //, 'theme_compat_reset_post' );
</del><span class="cx">
</span><del>- // Clear out the post related globals
- unset( $wp_query->posts );
- unset( $wp_query->post );
- unset( $post );
</del><ins>+ // Bail if dummy post is empty
+ if ( empty( $dummy ) ) {
+ return;
+ }
</ins><span class="cx">
</span><del>- // 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'];
-
</del><span class="cx"> // Set the $post global
</span><del>- $post = $wp_query->post;
</del><ins>+ $post = new WP_Post( (object) $dummy );
</ins><span class="cx">
</span><del>- // Setup the dummy post loop
- $wp_query->posts[0] = $wp_query->post;
</del><ins>+ // Copy the new post global into the main $wp_query
+ $wp_query->post = $post;
+ $wp_query->posts = array( $post );
</ins><span class="cx">
</span><span class="cx"> // Prevent comments form from appearing
</span><span class="cx"> $wp_query->post_count = 1;
</span><span class="lines">@@ -463,8 +438,20 @@
</span><span class="cx"> $wp_query->is_archive = $dummy['is_archive'];
</span><span class="cx"> $wp_query->is_tax = $dummy['is_tax'];
</span><span class="cx">
</span><ins>+ // 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 );
+ }
+
</ins><span class="cx"> // If we are resetting a post, we are in theme compat
</span><del>- bp_set_theme_compat_active();
</del><ins>+ bp_set_theme_compat_active( true );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>