Changeset 8682

Timestamp:

07/23/2014 07:42:14 PM (10 years ago)

Author:

r-a-y

Message:

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 #5418.

Location:

trunk/src

Files:

• bp-activity/bp-activity-screens.php (modified) (2 diffs)
• bp-blogs/bp-blogs-screens.php (modified) (2 diffs)
• bp-core/bp-core-template.php (modified) (1 diff)
• bp-forums/bp-forums-screens.php (modified) (1 diff)
• bp-groups/bp-groups-screens.php (modified) (3 diffs)
• bp-members/bp-members-screens.php (modified) (4 diffs)

trunk/src/bp-activity/bp-activity-screens.php

@@ -386 +386 @@
             'post_date'      => 0,
             'post_content'   => '',
-            'post_type'      => 'bp_activity',
+            'post_type'      => 'page',
             'post_status'    => 'publish',
             'is_page'        => true,
@@ -439 +439 @@
             'post_date'      => 0,
             'post_content'   => '',
-            'post_type'      => 'bp_activity',
+            'post_type'      => 'page',
             'post_status'    => 'publish',
             'is_page'        => true,

trunk/src/bp-blogs/bp-blogs-screens.php

@@ -150 +150 @@
             'post_date'      => 0,
             'post_content'   => '',
-            'post_type'      => 'bp_blogs',
+            'post_type'      => 'page',
             'post_status'    => 'publish',
             'is_page'        => true,
@@ -213 +213 @@
             'post_date'      => 0,
             'post_content'   => '',
-            'post_type'      => 'bp_group',
+            'post_type'      => 'page',
             'post_status'    => 'publish',
             'is_page'        => true,

trunk/src/bp-core/bp-core-template.php

@@ -2462 +2462 @@
 
 /**
+ * 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' );
+
+/**
  * Sort BuddyPress nav menu items by their position property.
  *

trunk/src/bp-forums/bp-forums-screens.php

@@ -217 +217 @@
             'post_date'      => 0,
             'post_content'   => '',
-            'post_type'      => 'bp_forum',
+            'post_type'      => 'page',
             'post_status'    => 'publish',
             'is_page'        => true,

trunk/src/bp-groups/bp-groups-screens.php

@@ -1072 +1072 @@
             'post_date'      => 0,
             'post_content'   => '',
-            'post_type'      => 'bp_group',
+            'post_type'      => 'page',
             'post_status'    => 'publish',
             'is_page'        => true,
@@ -1128 +1128 @@
             'post_date'      => 0,
             'post_content'   => '',
-            'post_type'      => 'bp_group',
+            'post_type'      => 'page',
             'post_status'    => 'publish',
             'is_page'        => true,
@@ -1188 +1188 @@
             'post_date'      => 0,
             'post_content'   => '',
-            'post_type'      => 'bp_group',
+            'post_type'      => 'page',
             'post_status'    => 'publish',
             'is_page'        => true,

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

@@ -359 +359 @@
             'post_date'      => 0,
             'post_content'   => '',
-            'post_type'      => 'bp_members',
+            'post_type'      => 'page',
             'post_status'    => 'publish',
             'is_page'        => true,
@@ -421 +421 @@
             'post_date'      => 0,
             'post_content'   => '',
-            'post_type'      => 'bp_members',
+            'post_type'      => 'page',
             'post_status'    => 'publish',
             'is_page'        => true,
@@ -530 +530 @@
         }
 
-        $post_type = bp_is_register_page() ? 'bp_register' : 'bp_activate';
-
         bp_theme_compat_reset_post( array(
             'ID'             => 0,
@@ -538 +536 @@
             'post_date'      => 0,
             'post_content'   => '',
-            'post_type'      => $post_type,
+            'post_type'      => 'page',
             'post_status'    => 'publish',
             'is_page'        => true,