Changeset 6395

Timestamp:

10/08/2012 09:16:00 AM (12 years ago)

Author:

r-a-y

Message:

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.

Location:

trunk

Files:

• bp-members/bp-members-screens.php (modified) (6 diffs)
• bp-xprofile/bp-xprofile-screens.php (modified) (1 diff)

trunk/bp-members/bp-members-screens.php

@@ -264 +264 @@
 
 /**
- * The main theme compat class for BuddyPress Groups
+ * The main theme compat class for BuddyPress Members.
  *
  * This class sets up the necessary theme compatability actions to safely output
@@ -274 +274 @@
 
     /**
-     * Setup the groups component theme compatibility
+     * Setup the members component theme compatibility
      *
      * @since BuddyPress (1.7)
@@ -283 +283 @@
 
     /**
-     * Are we looking at something that needs group theme compatability?
+     * Are we looking at something that needs members theme compatability?
      *
      * @since BuddyPress (1.7)
@@ -289 +289 @@
     public function is_members() {
 
-        // Bail if not looking at a group
-        if ( ! bp_is_members_component() )
+        // Bail if not looking at the members component or a user's page
+        if ( ! bp_is_members_component() && ! bp_displayed_user_id() )
             return;
 
-        // Group Directory
+        // Members Directory
         if ( ! bp_current_action() && ! bp_current_item() ) {
             bp_update_is_directory( true, 'members' );
 
-            do_action( 'members_directory_groups_setup' );
+            do_action( 'bp_members_screen_index' );
 
             add_action( 'bp_template_include_reset_dummy_post_data', array( $this, 'directory_dummy_post' ) );
             add_filter( 'bp_replace_the_content',                    array( $this, 'directory_content'    ) );
+
+        // 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' ) );
+
         }
     }
@@ -326 +332 @@
 
     /**
-     * Filter the_content with the groups index template part
+     * Filter the_content with the members index template part
      *
      * @since BuddyPress (1.7)
@@ -333 +339 @@
         bp_buffer_template_part( 'members/index' );
     }
+
+    /** 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' );
+    }
 }
 new BP_Members_Theme_Compat();

trunk/bp-xprofile/bp-xprofile-screens.php

@@ -192 +192 @@
     bp_core_load_template( apply_filters( 'xprofile_template_change_avatar', 'members/single/home' ) );
 }
-
-/** 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();