diff --git src/bp-blogs/bp-blogs-buddybar.php src/bp-blogs/bp-blogs-buddybar.php deleted file mode 100644 index 6d0a493..0000000 --- src/bp-blogs/bp-blogs-buddybar.php +++ /dev/null @@ -1,78 +0,0 @@ -'; - - _e( 'My Sites', 'buddypress' ); - - echo ''; - echo ''; - echo ''; - } -} -add_action( 'bp_adminbar_menus', 'bp_adminbar_blogs_menu', 6 ); diff --git src/bp-blogs/bp-blogs-loader.php src/bp-blogs/bp-blogs-loader.php index c392d32..55ad320 100644 --- src/bp-blogs/bp-blogs-loader.php +++ src/bp-blogs/bp-blogs-loader.php @@ -93,7 +93,6 @@ class BP_Blogs_Component extends BP_Component { 'filters', 'activity', 'functions', - 'buddybar' ); if ( is_multisite() ) diff --git src/bp-core/admin/bp-core-settings.php src/bp-core/admin/bp-core-settings.php index e112df7..71f8f33 100644 --- src/bp-core/admin/bp-core-settings.php +++ src/bp-core/admin/bp-core-settings.php @@ -49,21 +49,6 @@ function bp_admin_setting_callback_account_deletion() { - - /> - - -bp_options_nav[$parent_slug] ); } -/** 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 '
'; - - // **** Do bp-adminbar-logo Actions ******** - do_action( 'bp_adminbar_logo' ); - - echo ''; - echo "
\n\n"; - - $bp->doing_admin_bar = false; -} - -/** - * Output the BuddyBar logo. - */ -function bp_adminbar_logo() { - echo ''; -} - -/** - * 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 '
  • ' . __( 'Log In', 'buddypress' ) . '
    • '; - - // Show "Sign Up" link if user registrations are allowed - if ( bp_get_signup_allowed() ) - echo '
  • ' . __( 'Sign Up', 'buddypress' ) . '
    • '; -} - -/** - * 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 '
  • '; - echo __( 'My Account', 'buddypress' ) . ''; - echo ''; - echo '
    • '; -} - -function bp_adminbar_thisblog_menu() { - if ( current_user_can( 'edit_posts' ) ) { - echo '
  • '; - _e( 'Dashboard', 'buddypress' ); - echo ''; - echo ''; - echo '
    • '; - } -} - -/** - * Output the Random BuddyBar menu. - * - * Not visible for logged-in users. - */ -function bp_adminbar_random_menu() { -?> - -
  • - - -
    • - - 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' ); diff --git src/bp-core/bp-core-options.php src/bp-core/bp-core-options.php index 8fe2eff..c7d5d01 100644 --- src/bp-core/bp-core-options.php +++ src/bp-core/bp-core-options.php @@ -521,21 +521,6 @@ function bp_restrict_group_creation( $default = true ) { } /** - * Should the old BuddyBar be forced in place of the WP admin bar? - * - * @since BuddyPress (1.6.0) - * - * @uses bp_get_option() To get the BuddyBar option. - * - * @param bool $default Optional. Fallback value if not found in the database. - * Default: true. - * @return bool True if the BuddyBar should be forced on, otherwise false. - */ -function bp_force_buddybar( $default = true ) { - return (bool) apply_filters( 'bp_force_buddybar', (bool) bp_get_option( '_bp_force_buddybar', $default ) ); -} - -/** * Output the group forums root parent forum id. * * @since BuddyPress (1.6.0) diff --git src/bp-core/deprecated/2.1.php src/bp-core/deprecated/2.1.php index a6b8133..4d32728 100644 --- src/bp-core/deprecated/2.1.php +++ src/bp-core/deprecated/2.1.php @@ -18,7 +18,7 @@ if ( ! defined( 'ABSPATH' ) ) exit; function bp_core_register_deprecated_scripts() { $ext = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '.js' : '.min.js'; $url = buddypress()->plugin_url . 'bp-core/deprecated/js/'; - + $scripts = apply_filters( 'bp_core_register_deprecated_scripts', array( // Core 'bp-jquery-scroll-to' => 'jquery-scroll-to', @@ -44,7 +44,7 @@ add_action( 'bp_enqueue_scripts', 'bp_core_register_deprecated_scripts', 1 ); function bp_core_register_deprecated_styles() { $ext = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '.css' : '.min.css'; $url = buddypress()->plugin_url . 'bp-core/deprecated/css/'; - + $styles = apply_filters( 'bp_core_register_deprecated_styles', array( // Messages 'bp-messages-autocomplete' => 'autocomplete/jquery.autocompletefb', @@ -54,4 +54,535 @@ function bp_core_register_deprecated_styles() { wp_register_style( $id, $url . $file . $ext, array(), bp_get_version() ); } } -add_action( 'bp_enqueue_scripts', 'bp_core_register_deprecated_styles', 1 ); \ No newline at end of file +add_action( 'bp_enqueue_scripts', 'bp_core_register_deprecated_styles', 1 ); + +/** BuddyBar *****************************************************************/ + +/** + * Add a Sites menu to the BuddyBar. + * + * @since BuddyPress (1.0.0) + * @deprecated BuddyPress (2.1.0) + * + * @global object $bp The BuddyPress global settings object. + * + * @return bool|null Returns false on failure. Otherwise echoes the menu item. + */ +function bp_adminbar_blogs_menu() { + global $bp; + + 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' ); + if ( empty( $blogs ) ) { + $blogs = bp_blogs_get_blogs_for_user( bp_loggedin_user_id(), true ); + wp_cache_set( 'bp_blogs_of_user_' . bp_loggedin_user_id() . '_inc_hidden', $blogs, 'bp' ); + } + + $counter = 0; + if ( is_array( $blogs['blogs'] ) && (int) $blogs['count'] ) { + + echo '
  • '; + + _e( 'My Sites', 'buddypress' ); + + echo ''; + echo ''; + echo '
    • '; + } +} + +/** + * If user has upgraded to 1.6 and chose to retain their BuddyBar, offer then a switch to change over + * to the WP Toolbar. + * + * @since BuddyPress (1.6) + * @deprecated BuddyPress (2.1.0) + */ +function bp_admin_setting_callback_force_buddybar() { +?> + + /> + + +doing_admin_bar = true; + + echo '
    '; + + // **** Do bp-adminbar-logo Actions ******** + do_action( 'bp_adminbar_logo' ); + + echo ''; + echo "
    \n\n"; + + $bp->doing_admin_bar = false; +} + +/** + * Output the BuddyBar logo. + * + * @deprecated BuddyPress (2.1.0) + */ +function bp_adminbar_logo() { + echo ''; +} + +/** + * Output the "Log In" and "Sign Up" names to the BuddyBar. + * + * Visible only to visitors who are not logged in. + * + * @deprecated BuddyPress (2.1.0) + * + * @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 '
  • ' . __( 'Log In', 'buddypress' ) . '
    • '; + + // Show "Sign Up" link if user registrations are allowed + if ( bp_get_signup_allowed() ) + echo '
  • ' . __( 'Sign Up', 'buddypress' ) . '
    • '; +} + +/** + * Output the My Account BuddyBar menu. + * + * @deprecated BuddyPress (2.1.0) + * + * @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 '
  • '; + echo __( 'My Account', 'buddypress' ) . ''; + echo ''; + echo '
    • '; +} + +function bp_adminbar_thisblog_menu() { + if ( current_user_can( 'edit_posts' ) ) { + echo '
  • '; + _e( 'Dashboard', 'buddypress' ); + echo ''; + echo ''; + echo '
    • '; + } +} + +/** + * Output the Random BuddyBar menu. + * + * Not visible for logged-in users. + * + * @deprecated BuddyPress (2.1.0) + */ +function bp_adminbar_random_menu() { +?> + +
  • + + +
    • + + 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' ); + +/** + * Should the old BuddyBar be forced in place of the WP admin bar? + * + * @since BuddyPress (1.6.0) + * @deprecated BuddyPress (2.1.0) + * + * @uses bp_get_option() To get the BuddyBar option. + * + * @param bool $default Optional. Fallback value if not found in the database. + * Default: true. + * @return bool True if the BuddyBar should be forced on, otherwise false. + */ +function bp_force_buddybar( $default = true ) { + return (bool) apply_filters( 'bp_force_buddybar', (bool) bp_get_option( '_bp_force_buddybar', $default ) ); +} + +/** + * Add menu items to the BuddyBar. + * + * @since BuddyPress (1.0.0) + * + * @deprecated BuddyPress (2.1.0) + * + * @global BuddyPress $bp + */ +function bp_groups_adminbar_admin_menu() { + global $bp; + + 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; ?> + +
  • + + + +
    • + + blogid == bp_get_root_blog_id() || !bp_is_active( 'blogs' ) ) + return false; + + $blog_prefix = $wpdb->get_blog_prefix( $wpdb->blogid ); + $authors = $wpdb->get_results( "SELECT user_id, user_login, user_nicename, display_name, user_email, meta_value as caps FROM $wpdb->users u, $wpdb->usermeta um WHERE u.ID = um.user_id AND meta_key = '{$blog_prefix}capabilities' ORDER BY um.user_id" ); + + if ( !empty( $authors ) ) { + // This is a blog, render a menu with links to all authors + echo '
  • '; + _e('Blog Authors', 'buddypress'); + echo ''; + + echo ''; + echo '
    • '; + } +} +add_action( 'bp_adminbar_menus', 'bp_adminbar_authors_menu', 12 ); + +/** + * Add a member admin menu to the BuddyBar. + * + * Adds an Toolbar menu to any profile page providing site moderator actions + * that allow capable users to clean up a users account. + * + * @deprecated BuddyPress (2.1.0) + */ +function bp_members_adminbar_admin_menu() { + + // Only show if viewing a user + 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; ?> + +
  • + + + + +
    • + + '; + _e( 'Notifications', 'buddypress' ); + + if ( $notification_count = bp_notifications_get_unread_notification_count( bp_loggedin_user_id() ) ) : ?> + + '; + echo '