Changeset 6086

Timestamp:

06/13/2012 08:46:17 PM (11 years ago)

Author:

johnjamesjacoby

Message:

WP Version Check:

• Fixes missing notifications menu.
• Fixes missing groups menu.
• Correctly compares floats as numbers.
• Fix non-yoda comparisons.
• Fixes #4255 (1.5 branch)

Location:

branches/1.5

Files:

• bp-core/bp-core-adminbar.php (modified) (2 diffs)
• bp-groups/bp-groups-adminbar.php (modified) (2 diffs)
• bp-members/bp-members-adminbar.php (modified) (5 diffs)
• bp-themes/bp-default/functions.php (modified) (2 diffs)

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

@@ -21 +21 @@
  */
 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 );
@@ -41 +41 @@
 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 );

branches/1.5/bp-groups/bp-groups-adminbar.php

@@ -50 +50 @@
         return false;
 
-    if ( '3.2' == bp_get_major_wp_version() ) {
+    if ( 3.2 == bp_get_major_wp_version() ) {
 
         // Group avatar
@@ -72 +72 @@
         ) );
 
-    } elseif ( '3.3' == bp_get_major_wp_version() ) {
+    } elseif ( 3.3 <= bp_get_major_wp_version() ) {
         
         // Unique ID for the 'My Account' menu

branches/1.5/bp-members/bp-members-adminbar.php

@@ -51 +51 @@
     if ( is_user_logged_in() ) {
 
-        if ( '3.2' == bp_get_major_wp_version() ) {
+        if ( 3.2 == bp_get_major_wp_version() ) {
 
             // User avatar
@@ -126 +126 @@
         return false;
 
-    if ( '3.2' == bp_get_major_wp_version() ) {
+    if ( 3.2 == bp_get_major_wp_version() ) {
 
         // User avatar
@@ -146 +146 @@
         ) );
 
-    } elseif ( '3.3' == bp_get_major_wp_version() ) {
+    } elseif ( 3.3 <= bp_get_major_wp_version() ) {
         
         // Unique ID for the 'My Account' menu
@@ -222 +222 @@
     }
 
-    if ( '3.2' == bp_get_major_wp_version() ) {
+    if ( 3.2 == bp_get_major_wp_version() ) {
 
         // Add the top-level Notifications button
@@ -231 +231 @@
         ) );
 
-    } elseif ( '3.3' == bp_get_major_wp_version() ) {
+    } elseif ( 3.3 == bp_get_major_wp_version() ) {
         
         // Add the top-level Notifications button

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

@@ -84 +84 @@
     // 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'
@@ -108 +108 @@
         // 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',