Ticket #4255: 4255.patch

bp-core/bp-core-adminbar.php

@@ -20 +20 @@
  * @since BuddyPress (1.5.2)
  */
 function bp_core_admin_bar_version_check() {
-        if ( '3.2' == bp_get_major_wp_version() ) {
+        if ( 3.2 == bp_get_major_wp_version() ) {
                 add_action( 'bp_setup_admin_bar', 'bp_admin_bar_root_site',       3 );
                 add_action( 'bp_setup_admin_bar', 'bp_admin_bar_comments_menu',   3 );
                 add_action( 'bp_setup_admin_bar', 'bp_admin_bar_appearance_menu', 3 );
@@ -40 +40 @@
  */
 function bp_admin_bar_remove_wp_menus() {
 
-        if ( '3.2' == bp_get_major_wp_version() ) {
+        if ( 3.2 == bp_get_major_wp_version() ) {
                 remove_action( 'admin_bar_menu', 'wp_admin_bar_my_account_menu', 10 );
                 remove_action( 'admin_bar_menu', 'wp_admin_bar_my_sites_menu', 20 );
                 remove_action( 'admin_bar_menu', 'wp_admin_bar_dashboard_view_site_menu', 25 );

bp-groups/bp-groups-adminbar.php

@@ -49 +49 @@
         if ( !is_super_admin() && !bp_group_is_admin() )
                 return false;
 
-        if ( '3.2' == bp_get_major_wp_version() ) {
+        if ( 3.2 == bp_get_major_wp_version() ) {
 
                 // Group avatar
                 $avatar = bp_core_fetch_avatar( array(
@@ -71 +71 @@
                         'href'  => bp_get_group_permalink( $bp->groups->current_group )
                 ) );
 
-        } elseif ( '3.3' == bp_get_major_wp_version() ) {
- No newline at end of file
+        } elseif ( 3.3 <= bp_get_major_wp_version() ) {
+ No newline at end of file
                 
                 // Unique ID for the 'My Account' menu

bp-members/bp-members-adminbar.php

@@ -50 +50 @@
         // Logged in user
         if ( is_user_logged_in() ) {
 
-                if ( '3.2' == bp_get_major_wp_version() ) {
+                if ( 3.2 == bp_get_major_wp_version() ) {
 
                         // User avatar
                         $avatar = bp_core_fetch_avatar( array(
@@ -125 +125 @@
         if ( !current_user_can( 'edit_users' ) || bp_is_my_profile() )
                 return false;
 
-        if ( '3.2' == bp_get_major_wp_version() ) {
+        if ( 3.2 == bp_get_major_wp_version() ) {
 
                 // User avatar
                 $avatar = bp_core_fetch_avatar( array(
@@ -145 +145 @@
                         'href'  => bp_displayed_user_domain()
                 ) );
 
-        } elseif ( '3.3' == bp_get_major_wp_version() ) {
+        } elseif ( 3.3 <= bp_get_major_wp_version() ) {
                 
                 // Unique ID for the 'My Account' menu
                 $bp->user_admin_menu_id = 'user-admin';
@@ -221 +221 @@
                 $menu_title = __( 'Notifications', 'buddypress' );
         }
 
-        if ( '3.2' == bp_get_major_wp_version() ) {
+        if ( 3.2 == bp_get_major_wp_version() ) {
 
                 // Add the top-level Notifications button
                 $wp_admin_bar->add_menu( array(
@@ -230 +230 @@
                         'href'  => bp_loggedin_user_domain()
                 ) );
 
-        } elseif ( '3.3' == bp_get_major_wp_version() ) {
- No newline at end of file
+        } elseif ( 3.3 == bp_get_major_wp_version() ) {
+ No newline at end of file
                 
                 // Add the top-level Notifications button

bp-themes/bp-default/functions.php

@@ -83 +83 @@
 
         // This theme allows users to set a custom background
         // Backward-compatibility with WP < 3.4 will be removed in a future release
-        if ( bp_get_major_wp_version() >= 3.4 ) {
+        if ( 3.4 <= bp_get_major_wp_version() ) {
                 $custom_background_args = array(
                         'wp-head-callback' => 'bp_dtheme_custom_background_style'
                 );
@@ -107 +107 @@
 
                 // Add a way for the custom header to be styled in the admin panel that controls custom headers.
                 // Backward-compatibility with WP < 3.4 will be removed in a future release
-                if ( bp_get_major_wp_version() >= 3.4 ) {
+                if ( 3.4 <= bp_get_major_wp_version() ) {
                         $custom_header_args = array(
                                 'wp-head-callback' => 'bp_dtheme_header_style',
                                 'admin-head-callback' => 'bp_dtheme_admin_header_style'