Changeset 3928

Timestamp:

05/31/2012 05:02:02 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Theme Compatibility:

• Clean up bbpress-functions.php for Twenty Ten and Default theme packages.
• Simplify bbp_register_theme_package() to accept an array or a BBP_Theme_Compat object.
• Update bbPress::register_theme_packages() to use new style above.

Location:

branches/plugin

Files:

• bbp-includes/bbp-theme-compatibility.php (modified) (1 diff)
• bbp-theme-compat/bbpress-functions.php (modified) (1 diff)
• bbp-themes/bbp-twentyten/bbpress-functions.php (modified) (1 diff)
• bbpress.php (modified) (3 diffs)

branches/plugin/bbp-includes/bbp-theme-compatibility.php

@@ -268 +268 @@
  * @param array $theme
  */
-function bbp_register_theme_package( $theme = '', $override = true ) {
-
-    // Bail if no name or object passed is not a theme compat theme
+function bbp_register_theme_package( $theme = array(), $override = true ) {
+
+    // Create new BBP_Theme_Compat object from the $theme array
+    if ( is_array( $theme ) )
+        $theme = new BBP_Theme_Compat( $theme );
+
+    // Bail if $theme isn't a proper object
     if ( ! is_a( $theme, 'BBP_Theme_Compat' ) )
         return;

branches/plugin/bbp-theme-compat/bbpress-functions.php

@@ -64 +64 @@
      */
     private function setup_globals() {
-
-        // Use the default theme compat if current theme has not added support
-        if ( !current_theme_supports( 'bbpress' ) ) {
-            $this->id      = bbp_get_theme_compat_id();
-            $this->name    = bbp_get_theme_compat_name();
-            $this->version = bbp_get_theme_compat_version();
-            $this->dir     = bbp_get_theme_compat_dir();
-            $this->url     = bbp_get_theme_compat_url();
-
-        // Theme supports bbPress, so set some smart defaults
-        } else {
-
-            // @todo Remove function_exists check when WordPress 3.5 ships
-            $theme         = function_exists( 'wp_get_theme' ) ? wp_get_theme() : get_current_theme();
-            $this->id      = $theme->stylesheet;
-            $this->name    = sprintf( __( '%s (bbPress)', 'bbpress' ), $theme->name ) ;
-            $this->version = bbp_get_version();
-            $this->dir     = trailingslashit( get_stylesheet_directory() );
-            $this->url     = trailingslashit( get_stylesheet_directory_uri() );
-        }
-
-        // Conditionally add theme support if needed
-        if ( in_array( $this->id, array( get_template(), get_stylesheet() ) ) ) {
-            add_theme_support( 'bbpress' );
-        }
+        $bbp           = bbpress();
+        $this->id      = 'default';
+        $this->name    = __( 'bbPress Default', 'bbpress' );
+        $this->version = bbp_get_version();
+        $this->dir     = trailingslashit( $bbp->plugin_dir . 'bbp-theme-compat' );
+        $this->url     = trailingslashit( $bbp->plugin_url . 'bbp-theme-compat' );
     }
 

branches/plugin/bbp-themes/bbp-twentyten/bbpress-functions.php

@@ -62 +62 @@
         $this->dir     = trailingslashit( $bbp->themes_dir . 'bbp-twentyten' );
         $this->url     = trailingslashit( $bbp->themes_url . 'bbp-twentyten' );
-
-        // Conditionally add theme support if needed
-        if ( in_array( $this->id, array( get_template(), get_stylesheet() ) ) ) {
-            add_theme_support( 'bbpress' );
-        }
     }
 

branches/plugin/bbpress.php

@@ -533 +533 @@
         /** Default Theme *****************************************************/
 
-        bbp_register_theme_package( new BBP_Theme_Compat( array( 
+        bbp_register_theme_package( array(
             'id'      => 'default',
             'name'    => __( 'bbPress Default', 'bbpress' ),
@@ -539 +539 @@
             'dir'     => trailingslashit( $this->plugin_dir . 'bbp-theme-compat' ),
             'url'     => trailingslashit( $this->plugin_url . 'bbp-theme-compat' )
-        ) ) );
+        ) );
 
         /** Twenty Ten ********************************************************/
 
-        bbp_register_theme_package( new BBP_Theme_Compat( array( 
+        bbp_register_theme_package( array(
             'id'      => 'bbp-twentyten',
             'name'    => __( 'Twenty Ten (bbPress)', 'bbpress' ),
@@ -549 +549 @@
             'dir'     => trailingslashit( $this->themes_dir . 'bbp-twentyten' ),
             'url'     => trailingslashit( $this->themes_url . 'bbp-twentyten' )
-        ) ) );
+        ) );
     }