Changeset 5979

Timestamp:

04/13/2012 01:07:56 PM (14 years ago)

Author:

boonebgorges

Message:

Adds support for WP 3.4 theme functions. Fixes #4098. Props chrisclayton

Location:

branches/1.5

Files:

• bp-core/admin/bp-core-update.php (modified) (2 diffs)
• bp-core/bp-core-functions.php (modified) (1 diff)
• bp-themes/bp-default/functions.php (modified) (3 diffs)

branches/1.5/bp-core/admin/bp-core-update.php

@@ -604 +604 @@
 
                 $installed_plugins = get_plugins();
-                $installed_themes  = get_themes();
+
+                // Backward-compatibility with WP < 3.4 will be removed in a future release
+                if ( bp_get_major_wp_version() >= 3.4 ) {
+                        $installed_themes = wp_get_themes();
+                } else {
+                        $installed_themes = get_themes();
+                }
 
                 $template_pack_installed = false;
@@ -626 +632 @@
 
                 // Get theme screenshot
-                $current_theme = get_current_theme();
+                // Backward-compatibility with WP < 3.4 will be removed in a future release
+                if ( bp_get_major_wp_version() >= 3.4 ) {
+                        $current_theme = wp_get_theme();
+                } else {
+                        $current_theme = get_current_theme();
+                }
                 $screenshot    = '';
-                $themes        = get_themes();
-
-                if ( !empty( $themes[$current_theme]['Screenshot'] ) )
+
+                if ( !empty( $installed_themes[$current_theme]['Screenshot'] ) )
                         $screenshot = trailingslashit( get_stylesheet_directory_uri() ) . $themes[$current_theme]['Screenshot'];
         ?>

branches/1.5/bp-core/bp-core-functions.php

@@ -377 +377 @@
 
         // Get current theme info
-        $ct = current_theme_info();
+        // Backward-compatibility with WP < 3.4 will be removed in a future release
+        if ( bp_get_major_wp_version() >= 3.4 ) {
+                $ct = wp_get_theme();
+        } else {
+                $ct = get_current_theme();
+        }
 
         // The best way to remove this notice is to add a "buddypress" tag to

branches/1.5/bp-themes/bp-default/functions.php

@@ -83 +83 @@
 
         // This theme allows users to set a custom background
-        add_custom_background( 'bp_dtheme_custom_background_style' );
+        // Backward-compatibility with WP < 3.4 will be removed in a future release
+        if ( bp_get_major_wp_version() >= 3.4 ) {
+                $custom_background_args = array(
+                        'wp-head-callback' => 'bp_dtheme_custom_background_style'
+                );
+                add_theme_support( 'custom-background', $custom_background_args );
+        } else {
+                add_custom_background( 'bp_dtheme_custom_background_style' );
+        }
 
         // Add custom header support if allowed
@@ -99 +107 @@
 
                 // Add a way for the custom header to be styled in the admin panel that controls custom headers.
-                add_custom_image_header( 'bp_dtheme_header_style', 'bp_dtheme_admin_header_style' );
+                // Backward-compatibility with WP < 3.4 will be removed in a future release
+                if ( bp_get_major_wp_version() >= 3.4 ) {
+                        $custom_header_args = array(
+                                'wp-head-callback' => 'bp_dtheme_header_style',
+                                'admin-head-callback' => 'bp_dtheme_admin_header_style'
+                        );
+                        add_theme_support( 'custom-header', $custom_header_args );
+                } else {
+                        add_custom_image_header( 'bp_dtheme_header_style', 'bp_dtheme_admin_header_style' );
+                }
         }
 
@@ -181 +198 @@
  */
 function bp_dtheme_enqueue_styles() {
-        
+
         // Bump this when changes are made to bust cache
         $version = '20120110';