Changeset 6399

Timestamp:

10/13/2012 06:29:56 AM (13 years ago)

Author:

r-a-y

Message:

Theme Compat:

• Introduce bp_enable_theme_compat() function - this should be used to see if theme compatibility is enabled.

• In BP_Legacy class, switch out template / stylesheet check for bp_enable_theme_compat().

• In bp_has_custom_signup_page(), use bp_enable_theme_compat(). Use bp_has_custom_signup_page() in bp_core_wpsignup_redirect().

• Change BBP references to BP.

Location:

trunk

Files:

• bp-core/bp-core-theme-compatibility.php (modified) (5 diffs)
• bp-members/bp-members-functions.php (modified) (1 diff)
• bp-members/bp-members-template.php (modified) (1 diff)
• bp-themes/bp-legacy/buddypress-functions.php (modified) (1 diff)

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

@@ -33 +33 @@
  *
  * @since BuddyPress (1.7)
+ * @todo We should probably do something similar to BP_Component::start()
  */
 class BP_Theme_Compat {
@@ -56 +57 @@
      * @param array $properties
      */
-    public function __construct( Array $properties = array() ) {
+        public function __construct( Array $properties = array() ) {
         $this->_data = $properties;
     }
@@ -91 +92 @@
  *
  * @since BuddyPress (1.7)
- * @param BBP_Theme_Compat $theme
+ * @param BP_Theme_Compat $theme
  */
 function bp_setup_theme_compat( $theme = '' ) {
@@ -176 +177 @@
 
 /**
- * Gets true/false if page is currently inside theme compatibility
+ * 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()
+ * @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 ) {
+        $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 );
+}
+
+/**
+ * Gets true/false if the current, loaded page uses theme compatibility
  *
  * @since BuddyPress (1.7)
@@ -270 +314 @@
 function bp_register_theme_package( $theme = array(), $override = true ) {
 
-    // Create new BBP_Theme_Compat object from the $theme array
+    // Create new BP_Theme_Compat object from the $theme array
     if ( is_array( $theme ) )
         $theme = new BP_Theme_Compat( $theme );

trunk/bp-members/bp-members-functions.php

@@ -1396 +1396 @@
         return;
 
-    // Redirect to sign-up page
-    if ( locate_template( array( 'registration/register.php' ), false ) || locate_template( array( 'register.php' ), false ) )
+    // Redirect to sign-up page if a custom signup page exists
+    if ( bp_has_custom_signup_page() )
         bp_core_redirect( bp_get_signup_page() );
 }

trunk/bp-members/bp-members-template.php

@@ -968 +968 @@
 
 function bp_has_custom_signup_page() {
+    // if theme compat is enabled, we're already using our bundled templates
+    if ( bp_enable_theme_compat() )
+        return true;
+
+    // look in parent / child theme for custom registration templates
     if ( locate_template( array( 'register.php' ), false ) || locate_template( array( '/registration/register.php' ), false ) )
         return true;

trunk/bp-themes/bp-legacy/buddypress-functions.php

@@ -47 +47 @@
     public function __construct() {
 
-        // Bail if parent/child themes are bp-default
-        if ( in_array( 'bp-default', array( get_template(), get_stylesheet() ) ) )
+        // Bail if theme compat should be disabled
+        if ( ! bp_enable_theme_compat() )
             return;