Changeset 6404 for trunk/bp-core/bp-core-theme-compatibility.php

Timestamp:

10/13/2012 06:20:07 PM (13 years ago)

Author:

r-a-y

Message:

Theme Compat:

• Remove bp_enable_theme_compat() function - as JJJ said, this function isn't needed. See ​https://buddypress.trac.wordpress.org/ticket/3741#comment:40

• Introduce bp_is_theme_bp_default() function - this checks to see if the current theme uses bp-default. Replace all instances of bp_enable_theme_compat() with bp_is_theme_bp_default()

• In bp-core-filters.php, switch out hardcoded locate_template() registration template checks for bp_has_custom_signup_page().

File:

• trunk/bp-core/bp-core-theme-compatibility.php (modified) (1 diff)

trunk/bp-core/bp-core-theme-compatibility.php

@@ -177 +177 @@
 
 /**
- * See whether BuddyPress' theme compatibility is enabled or not.
- *
- * This differs from {@link bp_is_theme_compat_active()} as this function
- * checks to see if theme compat is enabled across the active blog.
- *
- * @since BuddyPress (1.7)
- * @uses wp_get_theme()
- * @uses apply_filters()
+ * See whether the current theme is good ol' bp-default.
+ *
+ * @since BuddyPress (1.7)
+ * @uses get_stylesheet()
  * @return bool
  */
-function bp_enable_theme_compat() {
-
-    // default is theme compat should be enabled
-    $retval = true;
-
-    // get current theme
-    $theme = wp_get_theme();
-
-    // get current theme's tags
-    $theme_tags = ! empty( $theme->tags ) ? $theme->tags : array();
-
-    // check to see if the 'buddypress' tag is in the theme 
-    // or if stylesheet is 'bp-default'
-    $backpat = in_array( 'buddypress', $theme_tags ) || $theme->get_stylesheet() == 'bp-default';
-    
-    // if we're already using a BP-compatible theme, disable theme compat
-    if ( $backpat ) {
+function bp_is_theme_bp_default() {
+    if ( get_stylesheet() == 'bp-default' ) {
+        $retval = true;
+    } else {
         $retval = false;
-
-    // if theme compat should still be enabled, do some other checks
-    // @todo what about themes that copied bp-default without using a child theme?
-    } elseif ( $retval ) {
-        // BP Template Pack check
-        // if TPack exists, we should disable theme compat
-        if ( function_exists( 'bp_tpack_theme_setup' ) ) {
-            $retval = false;
-        }
-    }
-
-    return apply_filters( 'bp_enable_theme_compat', $retval );
+    }
+
+    return $retval;
 }