Changeset 8568 for trunk/src/bp-core/bp-core-buddybar.php

Timestamp:

07/09/2014 04:43:00 PM (11 years ago)

Author:

boonebgorges

Message:

Formally deprecate the BuddyBar.

BuddyPress has been fully compatible with the WordPress toolbar since 1.6. We
have provided backward compatible support for the BuddyBar through the
BP_USE_WP_ADMIN_BAR constant. This changeset retains this support, but
officially deprecates it, with the following changes:

• All UI related to the BuddyBar has been removed from the Dashboard setings panels
• BuddyBar-related code has been moved to the deprecated functions folder
• A _doing_it_wrong() notice is now thrown when loading the BuddyBar

Fixes #5390

Props DJPaul for an initial patch

File:

• trunk/src/bp-core/bp-core-buddybar.php (modified) (2 diffs)

trunk/src/bp-core/bp-core-buddybar.php

@@ -557 +557 @@
 }
 
-/** BuddyBar Template functions ***********************************************/
-
-/**
- * Wrapper function for rendering the BuddyBar.
- *
- * @return bool|null Returns false if the BuddyBar is disabled.
- */
-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->doing_admin_bar = true;
-
-    echo '<div id="wp-admin-bar"><div class="padder">';
-
-    // **** Do bp-adminbar-logo Actions ********
-    do_action( 'bp_adminbar_logo' );
-
-    echo '<ul class="main-nav">';
-
-    // **** Do bp-adminbar-menus Actions ********
-    do_action( 'bp_adminbar_menus' );
-
-    echo '</ul>';
-    echo "</div></div><!-- #wp-admin-bar -->\n\n";
-
-    $bp->doing_admin_bar = false;
-}
-
-/**
- * Output the BuddyBar logo.
- */
-function bp_adminbar_logo() {
-    echo '<a href="' . bp_get_root_domain() . '" id="admin-bar-logo">' . get_blog_option( bp_get_root_blog_id(), 'blogname' ) . '</a>';
-}
-
-/**
- * Output the "Log In" and "Sign Up" names to the BuddyBar.
- *
- * Visible only to visitors who are not logged in.
- *
- * @return bool|null Returns false if the current user is logged in.
- */
-function bp_adminbar_login_menu() {
-
-    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() )
-        echo '<li class="bp-signup no-arrow"><a href="' . bp_get_signup_page() . '">' . __( 'Sign Up', 'buddypress' ) . '</a></li>';
-}
-
-/**
- * Output the My Account BuddyBar menu.
- *
- * @return bool|null Returns false on failure.
- */
-function bp_adminbar_account_menu() {
-    global $bp;
-
-    if ( !$bp->bp_nav || !is_user_logged_in() )
-        return false;
-
-    echo '<li id="bp-adminbar-account-menu"><a href="' . bp_loggedin_user_domain() . '">';
-    echo __( 'My Account', 'buddypress' ) . '</a>';
-    echo '<ul>';
-
-    // Loop through each navigation item
-    $counter = 0;
-    foreach( (array) $bp->bp_nav as $nav_item ) {
-        $alt = ( 0 == $counter % 2 ) ? ' class="alt"' : '';
-
-        if ( -1 == $nav_item['position'] )
-            continue;
-
-        echo '<li' . $alt . '>';
-        echo '<a id="bp-admin-' . $nav_item['css_id'] . '" href="' . $nav_item['link'] . '">' . $nav_item['name'] . '</a>';
-
-        if ( isset( $bp->bp_options_nav[$nav_item['slug']] ) && is_array( $bp->bp_options_nav[$nav_item['slug']] ) ) {
-            echo '<ul>';
-            $sub_counter = 0;
-
-            foreach( (array) $bp->bp_options_nav[$nav_item['slug']] as $subnav_item ) {
-                $link = $subnav_item['link'];
-                $name = $subnav_item['name'];
-
-                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 ) )
-                    $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"' : '';
-                echo '<li' . $alt . '><a id="bp-admin-' . $subnav_item['css_id'] . '" href="' . $link . '">' . $name . '</a></li>';
-                $sub_counter++;
-            }
-            echo '</ul>';
-        }
-
-        echo '</li>';
-
-        $counter++;
-    }
-
-    $alt = ( 0 == $counter % 2 ) ? ' class="alt"' : '';
-
-    echo '<li' . $alt . '><a id="bp-admin-logout" class="logout" href="' . wp_logout_url( home_url() ) . '">' . __( 'Log Out', 'buddypress' ) . '</a></li>';
-    echo '</ul>';
-    echo '</li>';
-}
-
-function bp_adminbar_thisblog_menu() {
-    if ( current_user_can( 'edit_posts' ) ) {
-        echo '<li id="bp-adminbar-thisblog-menu"><a href="' . admin_url() . '">';
-        _e( 'Dashboard', 'buddypress' );
-        echo '</a>';
-        echo '<ul>';
-
-        echo '<li class="alt"><a href="' . admin_url() . 'post-new.php">' . __( 'New Post', 'buddypress' ) . '</a></li>';
-        echo '<li><a href="' . admin_url() . 'edit.php">' . __( 'Manage Posts', 'buddypress' ) . '</a></li>';
-        echo '<li class="alt"><a href="' . admin_url() . 'edit-comments.php">' . __( 'Manage Comments', 'buddypress' ) . '</a></li>';
-
-        do_action( 'bp_adminbar_thisblog_items' );
-
-        echo '</ul>';
-        echo '</li>';
-    }
-}
-
-/**
- * Output the Random BuddyBar menu.
- *
- * Not visible for logged-in users.
- */
-function bp_adminbar_random_menu() {
-?>
-
-    <li class="align-right" id="bp-adminbar-visitrandom-menu">
-        <a href="#"><?php _e( 'Visit', 'buddypress' ) ?></a>
-        <ul class="random-list">
-            <li><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() ) . '?random-member' ?>" rel="nofollow"><?php _e( 'Random Member', 'buddypress' ) ?></a></li>
-
-            <?php if ( bp_is_active( 'groups' ) ) : ?>
-
-                <li class="alt"><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() ) . '?random-group' ?>"  rel="nofollow"><?php _e( 'Random Group', 'buddypress' ) ?></a></li>
-
-            <?php endif; ?>
-
-            <?php if ( is_multisite() && bp_is_active( 'blogs' ) ) : ?>
-
-                <li><a href="<?php echo trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() ) . '?random-blog' ?>"  rel="nofollow"><?php _e( 'Random Site', 'buddypress' ) ?></a></li>
-
-            <?php endif; ?>
-
-            <?php do_action( 'bp_adminbar_random_menu' ) ?>
-
-        </ul>
-    </li>
-
-    <?php
-}
 
 /**
@@ -748 +579 @@
     return 'true' === $pref;
 }
-
-/**
- * Enqueue the BuddyBar CSS.
- */
-function bp_core_load_buddybar_css() {
-    global $wp_styles;
-
-    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';
-
-    if ( file_exists( get_stylesheet_directory() . '/_inc/css/adminbar.css' ) ) { // Backwards compatibility
-        $stylesheet = get_stylesheet_directory_uri() . '/_inc/css/adminbar.css';
-    } else {
-        $stylesheet = buddypress()->plugin_url . "bp-core/css/buddybar{$min}.css";
-    }
-
-    wp_enqueue_style( 'bp-admin-bar', apply_filters( 'bp_core_buddybar_rtl_css', $stylesheet ), array(), bp_get_version() );
-    $wp_styles->add_data( 'bp-admin-bar', 'rtl', true );
-    if ( $min )
-        $wp_styles->add_data( 'bp-admin-bar', 'suffix', $min );
-}
-add_action( 'bp_init', 'bp_core_load_buddybar_css' );