Changeset 9470

Timestamp:

02/10/2015 01:09:09 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Beautify /deprecated/2.1.php:

• Add brackets
• Remove $bp global touches (See #5138)
• Use bp_is_root_blog() rather than direct comparisons to bp_get_root_blog()
• Easier to navigate when testing & debugging deprecated functionality

File:

• trunk/src/bp-core/deprecated/2.1.php (modified) (13 diffs)

trunk/src/bp-core/deprecated/2.1.php

@@ -97 +97 @@
  */
 function bp_adminbar_blogs_menu() {
-        global $bp;
-
-        if ( !is_user_logged_in() || !bp_is_active( 'blogs' ) )
-                return false;
-
-        if ( !is_multisite() )
-                return false;
+
+        if ( ! is_user_logged_in() || ! bp_is_active( 'blogs' ) ) {
+                return false;
+        }
+
+        if ( ! is_multisite() ) {
+                return false;
+        }
 
         $blogs = wp_cache_get( 'bp_blogs_of_user_' . bp_loggedin_user_id() . '_inc_hidden', 'bp' );
@@ -192 +193 @@
  */
 function bp_core_admin_bar() {
-        global $bp;
-
-        if ( defined( 'BP_DISABLE_ADMIN_BAR' ) && BP_DISABLE_ADMIN_BAR )
-                return false;
-
-        if ( (int) bp_get_option( 'hide-loggedout-adminbar' ) && !is_user_logged_in() )
-                return false;
+        $bp = buddypress();
+
+        if ( defined( 'BP_DISABLE_ADMIN_BAR' ) && BP_DISABLE_ADMIN_BAR ) {
+                return false;
+        }
+
+        if ( (int) bp_get_option( 'hide-loggedout-adminbar' ) && !is_user_logged_in() ) {
+                return false;
+        }
 
         $bp->doing_admin_bar = true;
@@ -238 +241 @@
 function bp_adminbar_login_menu() {
 
-        if ( is_user_logged_in() )
-                return false;
+        if ( is_user_logged_in() ) {
+                return false;
+        }
 
         echo '<li class="bp-login no-arrow"><a href="' . wp_login_url() . '">' . __( 'Log In', 'buddypress' ) . '</a></li>';
 
         // Show "Sign Up" link if user registrations are allowed
-        if ( bp_get_signup_allowed() )
+        if ( bp_get_signup_allowed() ) {
                 echo '<li class="bp-signup no-arrow"><a href="' . bp_get_signup_page() . '">' . __( 'Sign Up', 'buddypress' ) . '</a></li>';
+        }
 }
 
@@ -256 +261 @@
  */
 function bp_adminbar_account_menu() {
-        global $bp;
-
-        if ( !$bp->bp_nav || !is_user_logged_in() )
-                return false;
+        $bp = buddypress();
+
+        if ( empty( $bp->bp_nav ) || ! is_user_logged_in() ) {
+                return false;
+        }
 
         echo '<li id="bp-adminbar-account-menu"><a href="' . bp_loggedin_user_domain() . '">';
@@ -270 +276 @@
                 $alt = ( 0 == $counter % 2 ) ? ' class="alt"' : '';
 
-                if ( -1 == $nav_item['position'] )
+                if ( -1 == $nav_item['position'] ) {
                         continue;
+                }
 
                 echo '<li' . $alt . '>';
@@ -284 +291 @@
                                 $name = $subnav_item['name'];
 
-                                if ( bp_displayed_user_domain() )
+                                if ( bp_displayed_user_domain() ) {
                                         $link = str_replace( bp_displayed_user_domain(), bp_loggedin_user_domain(), $subnav_item['link'] );
-
-                                if ( isset( $bp->displayed_user->userdata->user_login ) )
+                                }
+
+                                if ( isset( $bp->displayed_user->userdata->user_login ) ) {
                                         $name = str_replace( $bp->displayed_user->userdata->user_login, $bp->loggedin_user->userdata->user_login, $subnav_item['name'] );
+                                }
 
                                 $alt = ( 0 == $sub_counter % 2 ) ? ' class="alt"' : '';
@@ -368 +377 @@
  */
 function bp_core_load_buddybar_css() {
-        if ( bp_use_wp_admin_bar() || ( (int) bp_get_option( 'hide-loggedout-adminbar' ) && !is_user_logged_in() ) || ( defined( 'BP_DISABLE_ADMIN_BAR' ) && BP_DISABLE_ADMIN_BAR ) )
+
+        if ( bp_use_wp_admin_bar() || ( (int) bp_get_option( 'hide-loggedout-adminbar' ) && !is_user_logged_in() ) || ( defined( 'BP_DISABLE_ADMIN_BAR' ) && BP_DISABLE_ADMIN_BAR ) ) {
                 return;
+        }
 
         $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
@@ -394 +405 @@
  *
  * @deprecated BuddyPress (2.1.0)
- *
- * @global BuddyPress $bp
  */
 function bp_groups_adminbar_admin_menu() {
-        global $bp;
-
-        if ( empty( $bp->groups->current_group ) )
-                return false;
+        $bp = buddypress();
+
+        if ( empty( $bp->groups->current_group ) ) {
+                return false;
+        }
 
         // Only group admins and site admins can see this menu
-        if ( !current_user_can( 'edit_users' ) && !bp_current_user_can( 'bp_moderate' ) && !bp_is_item_admin() )
-                return false; ?>
+        if ( !current_user_can( 'edit_users' ) && !bp_current_user_can( 'bp_moderate' ) && !bp_is_item_admin() ) {
+                return false;
+        } ?>
 
         <li id="bp-adminbar-adminoptions-menu">
@@ -471 +482 @@
 
         // Only for multisite
-        if ( !is_multisite() )
-                return false;
+        if ( ! is_multisite() ) {
+                return false;
+        }
 
         // Hide on root blog
-        if ( $wpdb->blogid == bp_get_root_blog_id() || !bp_is_active( 'blogs' ) )
-                return false;
+        if ( bp_is_root_blog( $wpdb->blogid ) || ! bp_is_active( 'blogs' ) ) {
+                return false;
+        }
 
         $blog_prefix = $wpdb->get_blog_prefix( $wpdb->blogid );
@@ -490 +503 @@
                 foreach( (array) $authors as $author ) {
                         $caps = maybe_unserialize( $author->caps );
-                        if ( isset( $caps['subscriber'] ) || isset( $caps['contributor'] ) ) continue;
+                        if ( isset( $caps['subscriber'] ) || isset( $caps['contributor'] ) ) {
+                                continue;
+                        }
 
                         echo '<li>';
@@ -522 +537 @@
 
         // Only show if viewing a user
-        if ( !bp_displayed_user_id() )
-                return false;
+        if ( ! bp_displayed_user_id() ) {
+                return false;
+        }
 
         // Don't show this menu to non site admins or if you're viewing your own profile
-        if ( !current_user_can( 'edit_users' ) || bp_is_my_profile() )
-                return false; ?>
+        if ( !current_user_can( 'edit_users' ) || bp_is_my_profile() ) {
+                return false;
+        } ?>
 
         <li id="bp-adminbar-adminoptions-menu">
@@ -570 +587 @@
         _e( 'Notifications', 'buddypress' );
 
-        if ( $notification_count = bp_notifications_get_unread_notification_count( bp_loggedin_user_id() ) ) : ?>
+        $notification_count = bp_notifications_get_unread_notification_count( bp_loggedin_user_id() );
+        $notifications      = bp_notifications_get_notifications_for_user( bp_loggedin_user_id() );
+
+        if ( ! empty( $notification_count ) ) : ?>
                 <span><?php echo bp_core_number_format( $notification_count ); ?></span>
         <?php
@@ -578 +598 @@
         echo '<ul>';
 
-        if ( $notifications = bp_notifications_get_notifications_for_user( bp_loggedin_user_id() ) ) {
+        if ( ! empty( $notifications ) ) {
                 $counter = 0;
                 for ( $i = 0, $count = count( $notifications ); $i < $count; ++$i ) {