X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/a6f44f0edcda2471c5a33e4156c1c9488c7f3210..refs/tags/wordpress-3.7:/wp-includes/admin-bar.php
diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php
index 756fc126..70c2a676 100644
--- a/wp-includes/admin-bar.php
+++ b/wp-includes/admin-bar.php
@@ -72,6 +72,8 @@ add_action( 'in_admin_header', 'wp_admin_bar_render', 0 );
* Add the WordPress logo menu.
*
* @since 3.3.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_wp_menu( $wp_admin_bar ) {
$wp_admin_bar->add_menu( array(
@@ -130,6 +132,8 @@ function wp_admin_bar_wp_menu( $wp_admin_bar ) {
* Add the "My Account" item.
*
* @since 3.3.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_my_account_item( $wp_admin_bar ) {
$user_id = get_current_user_id();
@@ -159,6 +163,8 @@ function wp_admin_bar_my_account_item( $wp_admin_bar ) {
* Add the "My Account" submenu items.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
$user_id = get_current_user_id();
@@ -206,6 +212,8 @@ function wp_admin_bar_my_account_menu( $wp_admin_bar ) {
* Add the "Site Name" menu.
*
* @since 3.3.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_site_menu( $wp_admin_bar ) {
global $current_site;
@@ -275,10 +283,10 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) {
* Add the "My Sites/[Site Name]" menu and all submenus.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
- global $wpdb;
-
// Don't show for logged out users or single site mode.
if ( ! is_user_logged_in() || ! is_multisite() )
return;
@@ -326,9 +334,15 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
) );
$wp_admin_bar->add_menu( array(
'parent' => 'network-admin',
- 'id' => 'network-admin-v',
- 'title' => __( 'Visit Network' ),
- 'href' => network_home_url(),
+ 'id' => 'network-admin-t',
+ 'title' => __( 'Themes' ),
+ 'href' => network_admin_url( 'themes.php' ),
+ ) );
+ $wp_admin_bar->add_menu( array(
+ 'parent' => 'network-admin',
+ 'id' => 'network-admin-p',
+ 'title' => __( 'Plugins' ),
+ 'href' => network_admin_url( 'plugins.php' ),
) );
}
@@ -396,6 +410,8 @@ function wp_admin_bar_my_sites_menu( $wp_admin_bar ) {
* Provide a shortlink.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_shortlink_menu( $wp_admin_bar ) {
$short = wp_get_shortlink( 0, 'query' );
@@ -418,6 +434,8 @@ function wp_admin_bar_shortlink_menu( $wp_admin_bar ) {
* Provide an edit link for posts and terms.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_edit_menu( $wp_admin_bar ) {
global $tag, $wp_the_query;
@@ -483,6 +501,8 @@ function wp_admin_bar_edit_menu( $wp_admin_bar ) {
* Add "Add New" menu.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_new_content_menu( $wp_admin_bar ) {
$actions = array();
@@ -548,6 +568,8 @@ function wp_admin_bar_new_content_menu( $wp_admin_bar ) {
* Add edit comments link with awaiting moderation count bubble.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_comments_menu( $wp_admin_bar ) {
if ( !current_user_can('edit_posts') )
@@ -572,6 +594,8 @@ function wp_admin_bar_comments_menu( $wp_admin_bar ) {
* Add appearance submenu items to the "Site Name" menu.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
$wp_admin_bar->add_group( array( 'parent' => 'site-name', 'id' => 'appearance' ) );
@@ -611,6 +635,8 @@ function wp_admin_bar_appearance_menu( $wp_admin_bar ) {
* Provide an update link if theme/plugin/core updates are available.
*
* @since 3.1.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_updates_menu( $wp_admin_bar ) {
@@ -636,6 +662,8 @@ function wp_admin_bar_updates_menu( $wp_admin_bar ) {
* Add search form.
*
* @since 3.3.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_search_menu( $wp_admin_bar ) {
if ( is_admin() )
@@ -661,6 +689,8 @@ function wp_admin_bar_search_menu( $wp_admin_bar ) {
* Add secondary menus.
*
* @since 3.3.0
+ *
+ * @param WP_Admin_Bar $wp_admin_bar
*/
function wp_admin_bar_add_secondary_groups( $wp_admin_bar ) {
$wp_admin_bar->add_group( array(
@@ -683,7 +713,6 @@ function wp_admin_bar_add_secondary_groups( $wp_admin_bar ) {
* Style and scripts for the admin bar.
*
* @since 3.1.0
- *
*/
function wp_admin_bar_header() { ?>
@@ -694,7 +723,6 @@ function wp_admin_bar_header() { ?>
* Default admin bar callback.
*
* @since 3.1.0
- *
*/
function _admin_bar_bump_cb() { ?>