<!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][6395] trunk: Theme Compat:</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, #logmsg > ol { margin-left: 0; 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/6395">6395</a></dd>
<dt>Author</dt> <dd>r-a-y</dd>
<dt>Date</dt> <dd>2012-10-08 09:16:00 +0000 (Mon, 08 Oct 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Theme Compat:
* Merge BP_XProfile_Theme_Compat class into the BP_Members_Theme_Compat class.
* This was done because if the Extended Profiles module was disabled, theme compat would fail on a displayed user's page.
* Fix PHPDoc in the BP_Members_Theme_Compat class.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpmembersbpmembersscreensphp">trunk/bp-members/bp-members-screens.php</a></li>
<li><a href="#trunkbpxprofilebpxprofilescreensphp">trunk/bp-xprofile/bp-xprofile-screens.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpmembersbpmembersscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-screens.php (6394 => 6395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-screens.php 2012-10-08 08:50:37 UTC (rev 6394)
+++ trunk/bp-members/bp-members-screens.php 2012-10-08 09:16:00 UTC (rev 6395)
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> /** Theme Compatability *******************************************************/
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * The main theme compat class for BuddyPress Groups
</del><ins>+ * The main theme compat class for BuddyPress Members.
</ins><span class="cx"> *
</span><span class="cx"> * This class sets up the necessary theme compatability actions to safely output
</span><span class="cx"> * group template parts to the_title and the_content areas of a theme.
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx"> class BP_Members_Theme_Compat {
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Setup the groups component theme compatibility
</del><ins>+ * Setup the members component theme compatibility
</ins><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.7)
</span><span class="cx"> */
</span><span class="lines">@@ -282,24 +282,30 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Are we looking at something that needs group theme compatability?
</del><ins>+ * Are we looking at something that needs members theme compatability?
</ins><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.7)
</span><span class="cx"> */
</span><span class="cx"> public function is_members() {
</span><span class="cx">
</span><del>- // Bail if not looking at a group
- if ( ! bp_is_members_component() )
</del><ins>+ // Bail if not looking at the members component or a user's page
+ if ( ! bp_is_members_component() && ! bp_displayed_user_id() )
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- // Group Directory
</del><ins>+ // Members Directory
</ins><span class="cx"> if ( ! bp_current_action() && ! bp_current_item() ) {
</span><span class="cx"> bp_update_is_directory( true, 'members' );
</span><span class="cx">
</span><del>- do_action( 'members_directory_groups_setup' );
</del><ins>+ do_action( 'bp_members_screen_index' );
</ins><span class="cx">
</span><span class="cx"> add_action( 'bp_template_include_reset_dummy_post_data', array( $this, 'directory_dummy_post' ) );
</span><span class="cx"> add_filter( 'bp_replace_the_content', array( $this, 'directory_content' ) );
</span><ins>+
+ // User page
+ } elseif ( bp_displayed_user_id() ) {
+ add_action( 'bp_template_include_reset_dummy_post_data', array( $this, 'single_dummy_post' ) );
+ add_filter( 'bp_replace_the_content', array( $this, 'single_dummy_content' ) );
+
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -325,12 +331,42 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Filter the_content with the groups index template part
</del><ins>+ * Filter the_content with the members index template part
</ins><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.7)
</span><span class="cx"> */
</span><span class="cx"> public function directory_content() {
</span><span class="cx"> bp_buffer_template_part( 'members/index' );
</span><span class="cx"> }
</span><ins>+
+ /** Single ****************************************************************/
+
+ /**
+ * Update the global $post with the displayed user's data
+ *
+ * @since BuddyPress (1.7)
+ */
+ public function single_dummy_post() {
+ bp_theme_compat_reset_post( array(
+ 'ID' => 0,
+ 'post_title' => bp_get_displayed_user_fullname(),
+ 'post_author' => 0,
+ 'post_date' => 0,
+ 'post_content' => '',
+ 'post_type' => 'bp_members',
+ 'post_status' => 'publish',
+ 'is_archive' => true,
+ 'comment_status' => 'closed'
+ ) );
+ }
+
+ /**
+ * Filter the_content with the members' single home template part
+ *
+ * @since BuddyPress (1.7)
+ */
+ public function single_dummy_content() {
+ bp_buffer_template_part( 'members/single/home' );
+ }
</ins><span class="cx"> }
</span><span class="cx"> new BP_Members_Theme_Compat();
</span></span></pre></div>
<a id="trunkbpxprofilebpxprofilescreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-xprofile/bp-xprofile-screens.php (6394 => 6395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-xprofile/bp-xprofile-screens.php 2012-10-08 08:50:37 UTC (rev 6394)
+++ trunk/bp-xprofile/bp-xprofile-screens.php 2012-10-08 09:16:00 UTC (rev 6395)
</span><span class="lines">@@ -191,74 +191,3 @@
</span><span class="cx">
</span><span class="cx"> bp_core_load_template( apply_filters( 'xprofile_template_change_avatar', 'members/single/home' ) );
</span><span class="cx"> }
</span><del>-
-/** Theme Compatability *******************************************************/
-
-/**
- * The main theme compat class for BuddyPress Profiles
- *
- * This class sets up the necessary theme compatability actions to safely output
- * group template parts to the_title and the_content areas of a theme.
- *
- * @since BuddyPress (1.7)
- */
-class BP_XProfile_Theme_Compat {
-
- /**
- * Setup the xprofile component theme compatibility
- *
- * @since BuddyPress (1.7)
- *
- * @todo is 'bp_screens' correct here?
- */
- public function __construct() {
- add_action( 'bp_setup_theme_compat', array( $this, 'is_xprofile' ) );
- }
-
- /**
- * Are we looking at something that needs group theme compatability?
- *
- * @since BuddyPress (1.7)
- */
- public function is_xprofile() {
-
- // Bail if not looking at a profile
- if ( ! bp_displayed_user_id() )
- return;
-
- // Creating a group
- add_action( 'bp_template_include_reset_dummy_post_data', array( $this, 'dummy_post' ) );
- add_filter( 'bp_replace_the_content', array( $this, 'dummy_content' ) );
- }
-
- /** Directory *************************************************************/
-
- /**
- * Update the global $post with directory data
- *
- * @since BuddyPress (1.7)
- */
- public function dummy_post() {
- bp_theme_compat_reset_post( array(
- 'ID' => 0,
- 'post_title' => bp_get_displayed_user_fullname(),
- 'post_author' => 0,
- 'post_date' => 0,
- 'post_content' => '',
- 'post_type' => 'bp_xprofile',
- 'post_status' => 'publish',
- 'is_archive' => true,
- 'comment_status' => 'closed'
- ) );
- }
-
- /**
- * Filter the_content with the groups index template part
- *
- * @since BuddyPress (1.7)
- */
- public function dummy_content() {
- bp_buffer_template_part( 'members/single/home' );
- }
-}
-new BP_XProfile_Theme_Compat();
</del></span></pre>
</div>
</div>
</body>
</html>