<!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][8682] trunk/src: Theme compatibility: Fix issues with themes using post type conditionals.</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/8682">8682</a></dd>
<dt>Author</dt> <dd>r-a-y</dd>
<dt>Date</dt> <dd>2014-07-23 19:42:14 +0000 (Wed, 23 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme compatibility: Fix issues with themes using post type conditionals.
Previously, when BP resets a post for theme compatibility, we set the
'post_type' to a post type that does not exist (eg. 'bp_activity'). For
themes doing conditional template loading based on the post type, BP's
theme compatibility would not kick in due to the non-existent post type.
This commit replaces all 'post_type' values in bp_theme_compat_reset_post()
to 'page' to address this problem.
For backward compatibility, this commit also modifies the post class to
emulate the older post classes prior to this commit resulting from the
'page' post type change.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5418">#5418</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivityscreensphp">trunk/src/bp-activity/bp-activity-screens.php</a></li>
<li><a href="#trunksrcbpblogsbpblogsscreensphp">trunk/src/bp-blogs/bp-blogs-screens.php</a></li>
<li><a href="#trunksrcbpcorebpcoretemplatephp">trunk/src/bp-core/bp-core-template.php</a></li>
<li><a href="#trunksrcbpforumsbpforumsscreensphp">trunk/src/bp-forums/bp-forums-screens.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsscreensphp">trunk/src/bp-groups/bp-groups-screens.php</a></li>
<li><a href="#trunksrcbpmembersbpmembersscreensphp">trunk/src/bp-members/bp-members-screens.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivityscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-activity/bp-activity-screens.php (8681 => 8682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-activity/bp-activity-screens.php 2014-07-23 19:27:19 UTC (rev 8681)
+++ trunk/src/bp-activity/bp-activity-screens.php 2014-07-23 19:42:14 UTC (rev 8682)
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx"> 'post_author' => 0,
</span><span class="cx"> 'post_date' => 0,
</span><span class="cx"> 'post_content' => '',
</span><del>- 'post_type' => 'bp_activity',
</del><ins>+ 'post_type' => 'page',
</ins><span class="cx"> 'post_status' => 'publish',
</span><span class="cx"> 'is_page' => true,
</span><span class="cx"> 'comment_status' => 'closed'
</span><span class="lines">@@ -438,7 +438,7 @@
</span><span class="cx"> 'post_author' => 0,
</span><span class="cx"> 'post_date' => 0,
</span><span class="cx"> 'post_content' => '',
</span><del>- 'post_type' => 'bp_activity',
</del><ins>+ 'post_type' => 'page',
</ins><span class="cx"> 'post_status' => 'publish',
</span><span class="cx"> 'is_page' => true,
</span><span class="cx"> 'comment_status' => 'closed'
</span></span></pre></div>
<a id="trunksrcbpblogsbpblogsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-blogs/bp-blogs-screens.php (8681 => 8682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-blogs/bp-blogs-screens.php 2014-07-23 19:27:19 UTC (rev 8681)
+++ trunk/src/bp-blogs/bp-blogs-screens.php 2014-07-23 19:42:14 UTC (rev 8682)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> 'post_author' => 0,
</span><span class="cx"> 'post_date' => 0,
</span><span class="cx"> 'post_content' => '',
</span><del>- 'post_type' => 'bp_blogs',
</del><ins>+ 'post_type' => 'page',
</ins><span class="cx"> 'post_status' => 'publish',
</span><span class="cx"> 'is_page' => true,
</span><span class="cx"> 'comment_status' => 'closed'
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx"> 'post_author' => 0,
</span><span class="cx"> 'post_date' => 0,
</span><span class="cx"> 'post_content' => '',
</span><del>- 'post_type' => 'bp_group',
</del><ins>+ 'post_type' => 'page',
</ins><span class="cx"> 'post_status' => 'publish',
</span><span class="cx"> 'is_page' => true,
</span><span class="cx"> 'comment_status' => 'closed'
</span></span></pre></div>
<a id="trunksrcbpcorebpcoretemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-core/bp-core-template.php (8681 => 8682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-core/bp-core-template.php 2014-07-23 19:27:19 UTC (rev 8681)
+++ trunk/src/bp-core/bp-core-template.php 2014-07-23 19:42:14 UTC (rev 8682)
</span><span class="lines">@@ -2461,6 +2461,67 @@
</span><span class="cx"> add_filter( 'body_class', 'bp_get_the_body_class', 10, 2 );
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Customizes the post CSS class according to BuddyPress content.
+ *
+ * Hooked to the 'post_class' filter.
+ *
+ * @since BuddyPress (2.1.0)
+ *
+ * @param array $wp_classes The post classes coming from WordPress.
+ * @return array
+ */
+function bp_get_the_post_class( $wp_classes = array() ) {
+ // don't do anything if we're not on a BP page
+ if ( ! is_buddypress() ) {
+ return $wp_classes;
+ }
+
+ $bp_classes = array();
+
+ if ( bp_is_user() || bp_is_single_activity() ) {
+ $bp_classes[] = 'bp_members';
+
+ } elseif ( bp_is_group() ) {
+ $bp_classes[] = 'bp_group';
+
+ } elseif ( bp_is_activity_component() ) {
+ $bp_classes[] = 'bp_activity';
+
+ } elseif ( bp_is_blogs_component() ) {
+ $bp_classes[] = 'bp_blogs';
+
+ } elseif ( bp_is_register_page() ) {
+ $bp_classes[] = 'bp_register';
+
+ } elseif ( bp_is_activation_page() ) {
+ $bp_classes[] = 'bp_activate';
+
+ } elseif ( bp_is_forums_component() && bp_is_directory() ) {
+ $bp_classes[] = 'bp_forum';
+ }
+
+ if ( empty( $bp_classes ) ) {
+ return $wp_classes;
+ }
+
+ // emulate post type css class
+ foreach ( $bp_classes as $bp_class ) {
+ $bp_classes[] = "type-{$bp_class}";
+ }
+
+ // removes the 'page' and 'type-page' post classes
+ // we need to remove these classes since they did not exist before we switched
+ // theme compat to use the 'page' post type
+ $page_key = array_search( 'page', $wp_classes );
+ $page_type_key = array_search( 'type-page', $wp_classes );
+ unset( $wp_classes[$page_key], $wp_classes[$page_type_key] );
+
+ // okay let's merge!
+ return array_unique( array_merge( $bp_classes, $wp_classes ) );
+}
+add_filter( 'post_class', 'bp_get_the_post_class' );
+
+/**
</ins><span class="cx"> * Sort BuddyPress nav menu items by their position property.
</span><span class="cx"> *
</span><span class="cx"> * This is an internal convenience function and it will probably be removed in
</span></span></pre></div>
<a id="trunksrcbpforumsbpforumsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-forums/bp-forums-screens.php (8681 => 8682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-forums/bp-forums-screens.php 2014-07-23 19:27:19 UTC (rev 8681)
+++ trunk/src/bp-forums/bp-forums-screens.php 2014-07-23 19:42:14 UTC (rev 8682)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> 'post_author' => 0,
</span><span class="cx"> 'post_date' => 0,
</span><span class="cx"> 'post_content' => '',
</span><del>- 'post_type' => 'bp_forum',
</del><ins>+ 'post_type' => 'page',
</ins><span class="cx"> 'post_status' => 'publish',
</span><span class="cx"> 'is_page' => true,
</span><span class="cx"> 'comment_status' => 'closed'
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-groups/bp-groups-screens.php (8681 => 8682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-groups/bp-groups-screens.php 2014-07-23 19:27:19 UTC (rev 8681)
+++ trunk/src/bp-groups/bp-groups-screens.php 2014-07-23 19:42:14 UTC (rev 8682)
</span><span class="lines">@@ -1071,7 +1071,7 @@
</span><span class="cx"> 'post_author' => 0,
</span><span class="cx"> 'post_date' => 0,
</span><span class="cx"> 'post_content' => '',
</span><del>- 'post_type' => 'bp_group',
</del><ins>+ 'post_type' => 'page',
</ins><span class="cx"> 'post_status' => 'publish',
</span><span class="cx"> 'is_page' => true,
</span><span class="cx"> 'comment_status' => 'closed'
</span><span class="lines">@@ -1127,7 +1127,7 @@
</span><span class="cx"> 'post_author' => 0,
</span><span class="cx"> 'post_date' => 0,
</span><span class="cx"> 'post_content' => '',
</span><del>- 'post_type' => 'bp_group',
</del><ins>+ 'post_type' => 'page',
</ins><span class="cx"> 'post_status' => 'publish',
</span><span class="cx"> 'is_page' => true,
</span><span class="cx"> 'comment_status' => 'closed'
</span><span class="lines">@@ -1187,7 +1187,7 @@
</span><span class="cx"> 'post_author' => 0,
</span><span class="cx"> 'post_date' => 0,
</span><span class="cx"> 'post_content' => '',
</span><del>- 'post_type' => 'bp_group',
</del><ins>+ 'post_type' => 'page',
</ins><span class="cx"> 'post_status' => 'publish',
</span><span class="cx"> 'is_page' => true,
</span><span class="cx"> 'comment_status' => 'closed'
</span></span></pre></div>
<a id="trunksrcbpmembersbpmembersscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-members/bp-members-screens.php (8681 => 8682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-members/bp-members-screens.php 2014-07-23 19:27:19 UTC (rev 8681)
+++ trunk/src/bp-members/bp-members-screens.php 2014-07-23 19:42:14 UTC (rev 8682)
</span><span class="lines">@@ -358,7 +358,7 @@
</span><span class="cx"> 'post_author' => 0,
</span><span class="cx"> 'post_date' => 0,
</span><span class="cx"> 'post_content' => '',
</span><del>- 'post_type' => 'bp_members',
</del><ins>+ 'post_type' => 'page',
</ins><span class="cx"> 'post_status' => 'publish',
</span><span class="cx"> 'is_page' => true,
</span><span class="cx"> 'comment_status' => 'closed'
</span><span class="lines">@@ -420,7 +420,7 @@
</span><span class="cx"> 'post_author' => 0,
</span><span class="cx"> 'post_date' => 0,
</span><span class="cx"> 'post_content' => '',
</span><del>- 'post_type' => 'bp_members',
</del><ins>+ 'post_type' => 'page',
</ins><span class="cx"> 'post_status' => 'publish',
</span><span class="cx"> 'is_page' => true,
</span><span class="cx"> 'comment_status' => 'closed'
</span><span class="lines">@@ -529,15 +529,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $post_type = bp_is_register_page() ? 'bp_register' : 'bp_activate';
-
</del><span class="cx"> bp_theme_compat_reset_post( array(
</span><span class="cx"> 'ID' => 0,
</span><span class="cx"> 'post_title' => $title,
</span><span class="cx"> 'post_author' => 0,
</span><span class="cx"> 'post_date' => 0,
</span><span class="cx"> 'post_content' => '',
</span><del>- 'post_type' => $post_type,
</del><ins>+ 'post_type' => 'page',
</ins><span class="cx"> 'post_status' => 'publish',
</span><span class="cx"> 'is_page' => true,
</span><span class="cx"> 'comment_status' => 'closed'
</span></span></pre>
</div>
</div>
</body>
</html>