diff --git a/wp-includes/admin-bar.php b/wp-includes/admin-bar.php
new file mode 100644
index 0000000000..6af0fe3175
--- /dev/null
+++ b/wp-includes/admin-bar.php
@@ -0,0 +1,346 @@
+menu member var.
+ * This is called very late on the footer actions so that it will render after anything else being
+ * added to the footer.
+ *
+ * It includes the action "wp_before_admin_bar_render" which should be used to hook in and
+ * add new menus to the admin bar. That way you can be sure that you are adding at most optimal point,
+ * right before the admin bar is rendered. This also gives you access to the $post global, among others.
+ */
+function wp_admin_bar_render() {
+ global $wp_admin_bar;
+
+ if ( !is_object( $wp_admin_bar ) )
+ return false;
+
+ $wp_admin_bar->load_user_locale_translations();
+
+ do_action( 'wp_before_admin_bar_render' );
+
+ $wp_admin_bar->render();
+
+ do_action( 'wp_after_admin_bar_render' );
+
+ $wp_admin_bar->unload_user_locale_translations();
+}
+add_action( 'wp_footer', 'wp_admin_bar_render', 1000 );
+add_action( 'admin_footer', 'wp_admin_bar_render', 1000 );
+
+/**
+ * Show the logged in user's gravatar as a separator.
+ */
+function wp_admin_bar_me_separator() {
+ global $wp_admin_bar, $current_user;
+
+ if ( !is_object( $wp_admin_bar ) )
+ return false;
+
+ $wp_admin_bar->add_menu( array( 'id' => 'me', 'title' => get_avatar( $current_user->ID, 16 ), 'href' => $wp_admin_bar->user->account_domain . 'wp-admin/profile.php' ) );
+}
+add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_me_separator', 10 );
+
+/**
+ * Use the $wp_admin_bar global to add the "My Account" menu and all submenus.
+ */
+function wp_admin_bar_my_account_menu() {
+ global $wp_admin_bar, $current_user;
+
+ if ( !is_object( $wp_admin_bar ) )
+ return false;
+
+ /* Add the 'My Account' menu */
+ $wp_admin_bar->add_menu( array( 'id' => 'my-account', 'title' => __( 'My Account' ), 'href' => admin_url('profile.php') ) );
+
+ /* Add the "My Account" sub menus */
+ $wp_admin_bar->add_menu( array( 'parent' => 'my-account', 'title' => __( 'Edit My Profile' ), 'href' => admin_url('profile.php') ) );
+ $wp_admin_bar->add_menu( array( 'parent' => 'my-account', 'title' => __( 'Global Dashboard' ), 'href' => admin_url() ) );
+ $wp_admin_bar->add_menu( array( 'parent' => 'my-account', 'title' => __( 'Log Out' ), 'href' => wp_logout_url() ) );
+}
+add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_account_menu', 20 );
+
+/**
+ * Use the $wp_admin_bar global to add the "My Blogs/[Blog Name]" menu and all submenus.
+ */
+function wp_admin_bar_my_blogs_menu() {
+ global $wpdb, $wp_admin_bar;
+
+ if ( !is_object( $wp_admin_bar ) )
+ return false;
+
+ /* Remove the global dashboard */
+ if ( is_multisite() ) {
+ foreach ( (array) $wp_admin_bar->user->blogs as $key => $blog ) {
+ if ( get_dashboard_blog() == $blog->domain )
+ unset( $wp_admin_bar->user->blogs[$key] );
+ }
+ }
+
+ /* Add the 'My Dashboards' menu if the user has more than one blog. */
+ if ( count( $wp_admin_bar->user->blogs ) > 1 ) {
+ $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Blogs' ), 'href' => $wp_admin_bar->user->account_domain ) );
+
+ $default = includes_url('images/wpmini-blue.png');
+
+ $counter = 2;
+ foreach ( (array) $wp_admin_bar->user->blogs as $blog ) {
+ $blogdomain = preg_replace( '!^https?://!', '', $blog->siteurl );
+ // @todo Replace with some favicon lookup.
+ //$blavatar = ', 'img', 16, $default ) ) . ')
';
+ $blavatar = ' . ')
';;
+
+ $marker = '';
+ if ( strlen($blog->blogname) > 35 )
+ $marker = '...';
+
+ if ( empty( $blog->blogname ) )
+ $blogname = $blog->domain;
+ else
+ $blogname = substr( $blog->blogname, 0, 35 ) . $marker;
+
+ if ( !isset( $blog->visible ) || $blog->visible === true ) {
+ $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-' . $blog->userblog_id, 'title' => $blavatar . $blogname, 'href' => constant( 'PROTO' ) . $blogdomain . '/wp-admin/' ) );
+ $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-d', 'title' => __( 'Dashboard' ), 'href' => constant( 'PROTO' ) . $blogdomain . '/wp-admin/' ) );
+ $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-n', 'title' => __( 'New Post' ), 'href' => constant( 'PROTO' ) . $blogdomain . '/wp-admin/post-new.php' ) );
+ // @todo, stats plugins should add this:
+ //$wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-s', 'title' => __( 'Blog Stats' ), 'href' => constant( 'PROTO' ) . $blogdomain . '/wp-admin/index.php?page=stats' ) );
+ $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-c', 'title' => __( 'Manage Comments' ), 'href' => constant( 'PROTO' ) . $blogdomain . '/wp-admin/edit-comments.php' ) );
+ $wp_admin_bar->add_menu( array( 'parent' => 'blog-' . $blog->userblog_id, 'id' => 'blog-' . $blog->userblog_id . '-v', 'title' => __( 'Read Blog' ), 'href' => constant( 'PROTO' ) . $blogdomain ) );
+ }
+ $counter++;
+ }
+
+ /* Add the "Manage Blogs" menu item */
+ // @todo, use dashboard blog.
+ $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'manage-blogs', 'title' => __( 'Manage Blogs' ), admin_url('my-sites.php') ) );
+
+ /* Add the 'My Dashboard' menu if the user only has one blog. */
+ } else {
+ $wp_admin_bar->add_menu( array( 'id' => 'my-blogs', 'title' => __( 'My Blog' ), 'href' => $wp_admin_bar->user->account_domain ) );
+
+ $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-d', 'title' => __( 'Dashboard' ), 'href' => admin_url() ) );
+ $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-n', 'title' => __( 'New Post' ), 'href' => admin_url('post-new.php') ) );
+ // @todo Stats plugins should add this.
+ //$wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-s', 'title' => __( 'Blog Stats' ), 'href' => admin_ur;('index.php?page=stats') ) );
+ $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-c', 'title' => __( 'Manage Comments' ), 'href' => admin_url('edit-comments.php') ) );
+ $wp_admin_bar->add_menu( array( 'parent' => 'my-blogs', 'id' => 'blog-1-v', 'title' => __( 'Read Blog' ), 'href' => home_url() ) );
+ }
+}
+add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_my_blogs_menu', 30 );
+
+/**
+ * Show the blavatar of the current blog as a separator.
+ */
+function wp_admin_bar_blog_separator() {
+ global $wp_admin_bar, $current_user, $current_blog;
+
+ if ( !is_object( $wp_admin_bar ) )
+ return false;
+
+ $default = includes_url('images/wpmini-blue.png');
+
+ $wp_admin_bar->add_menu( array( 'id' => 'blog', 'title' => '
', 'href' => home_url() ) );
+}
+add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_blog_separator', 40 );
+
+/**
+ * Use the $wp_admin_bar global to add a menu for blog info, accessable to all users.
+ */
+function wp_admin_bar_bloginfo_menu() {
+ global $wp_admin_bar;
+
+ if ( !is_object( $wp_admin_bar ) )
+ return false;
+
+ /* Add the Blog Info menu */
+ $wp_admin_bar->add_menu( array( 'id' => 'bloginfo', 'title' => __( 'Blog Info' ), 'href' => '' ) );
+
+ $wp_admin_bar->add_menu( array( 'parent' => 'bloginfo', 'title' => __( 'Get Shortlink' ), 'href' => '', 'meta' => array( 'onclick' => 'javascript:function wpcomshort() { var url=document.location;var links=document.getElementsByTagName('link');var found=0;for(var i = 0, l; l = links[i]; i++){if(l.getAttribute('rel')=='shortlink') {found=l.getAttribute('href');break;}}if (!found) {for (var i = 0; l = document.links[i]; i++) {if (l.getAttribute('rel') == 'shortlink') {found = l.getAttribute('href');break;}}}if (found) {prompt('URL:', found);} else {alert('No shortlink available for this page'); } return false; } wpcomshort();' ) ) );
+}
+add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_bloginfo_menu', 50 );
+
+/**
+ * Use the $wp_admin_bar global to add the "Edit Post" menu when viewing a single post.
+ */
+function wp_admin_bar_edit_menu() {
+ global $post, $wp_admin_bar;
+
+ if ( !is_object( $wp_admin_bar ) )
+ return false;
+
+ if ( !is_single() && !is_page() )
+ return false;
+
+ if ( !$post_type_object = get_post_type_object( $post->post_type ) )
+ return false;
+
+ if ( !current_user_can( $post_type_object->cap->edit_post, $post->ID ) )
+ return false;
+
+ $wp_admin_bar->add_menu( array( 'id' => 'edit', 'title' => __( 'Edit' ), 'href' => get_edit_post_link( $post->ID ) ) );
+}
+add_action( 'wp_before_admin_bar_render', 'wp_admin_bar_edit_menu', 100 );
+
+/**
+ * Load up the CSS needed to render the admin bar nice and pretty.
+ */
+function wp_admin_bar_css() {
+ global $pagenow, $wp_locale;
+
+ if ( !is_user_logged_in() )
+ return false;
+
+ if ( 'press-this.php' == $pagenow )
+ return;
+
+ $nobump = false;
+
+ /* Wish we could use wp_enqueue_style() here, but it will not let us pass GET params to the stylesheet correctly. */
+ ?>
+
+
+
+
diff --git a/wp-includes/admin-bar/admin-bar-class.php b/wp-includes/admin-bar/admin-bar-class.php
new file mode 100644
index 0000000000..91e30dd5fd
--- /dev/null
+++ b/wp-includes/admin-bar/admin-bar-class.php
@@ -0,0 +1,168 @@
+user = new stdClass;
+ $this->menu = new stdClass;
+
+ /* Populate settings we need for the menu based on the current user. */
+ $this->user->blogs = get_ordered_blogs_of_user( $current_user->id );
+ if ( is_multisite() ) {
+ $this->user->active_blog = get_active_blog_for_user( $current_user->id );
+ $this->user->domain = ( $this->user->active_blog == 'username only' ) ? get_dashboard_blog() : trailingslashit( get_home_url( $this->user->active_blog->blog_id ) );
+ $this->user->account_domain = $this->user->domain;
+ } else {
+ $this->user->active_blog = $this->user->blogs[$blog_id];
+ $this->user->domain = home_url();
+ $this->user->account_domain = home_url();
+ }
+ $this->user->locale = get_locale();
+ }
+
+ function add_menu( $args = array() ) {
+ $defaults = array(
+ 'title' => false,
+ 'href' => false,
+ 'parent' => false, // false for a root menu, pass the ID value for a submenu of that menu.
+ 'id' => false, // defaults to a sanitized title value.
+ 'meta' => false // array of any of the following options: array( 'html' => '', 'class' => '', 'onclick' => '', target => '' );
+ );
+
+ $r = wp_parse_args( $args, $defaults );
+ extract( $r, EXTR_SKIP );
+
+ if ( empty( $title ) )
+ return false;
+
+ /* Make sure we have a valid ID */
+ if ( empty( $id ) )
+ $id = esc_attr( sanitize_title( trim( $title ) ) );
+
+ if ( !empty( $parent ) ) {
+ /* Add the menu to the parent item */
+ $child = array(
+ 'id' => $id,
+ 'title' => $title,
+ 'href' => $href
+ );
+
+ if ( !empty( $meta ) )
+ $child['meta'] = $meta;
+
+ $this->add_node( $parent, $this->menu, $child );
+ } else {
+ /* Add the menu item */
+ $this->menu->{$id} = array(
+ 'title' => $title,
+ 'href' => $href
+ );
+
+ if ( !empty( $meta ) )
+ $this->menu->{$id}['meta'] = $meta;
+ }
+ }
+
+ function remove_menu( $id ) {
+ return $this->remove_node( $id, $this->menu );
+ }
+
+ function render() {
+ ?>
+
+
+
+ menu as $id => $menu_item ) : ?>
+ recursive_render( $id, $menu_item ) ?>
+
+
+
+
+
+
+
+
+
+
Debugging blog # on
+
+
+
+
+
+
+
+
There are too many queries to show easily! Show them anyway.
";
+
+ $out .= '';
+ $first_query = 0;
+ $counter = 0;
+
+ foreach ( $wpdb->queries as $q ) {
+ list($query, $elapsed, $debug) = $q;
+
+ $total_time += $elapsed;
+
+ if ( !$show_many && ++$counter > 500 )
+ continue;
+
+ $query = nl2br(esc_html($query));
+
+ // $dbhname, $host, $port, $name, $tcp, $elapsed
+ $out .= "- $query
$debug #{$counter} (" . number_format(sprintf('%0.1f', $elapsed * 1000), 1, '.', ',') . "ms)
\n";
+ }
+ $out .= '
';
+ } else {
+ $out .= "There are no queries on this page, you won the prize!!! :)
";
+ }
+
+ $query_count = 'Total Queries:' . number_format( $wpdb->num_queries ) . "
\n";
+ $query_time = 'Total query time:' . number_format(sprintf('%0.1f', $total_time * 1000), 1) . "ms
\n";
+ $memory_usage = 'Peak Memory Used:' . number_format( memory_get_peak_usage( ) ) . " bytes
\n";
+
+ $out = $query_count . $query_time . $memory_usage . $out;
+
+ return $out;
+}
+
+function wp_admin_bar_debug_object_cache() {
+ global $wp_object_cache;
+ ob_start();
+ echo "";
+ $wp_object_cache->stats();
+ echo "
";
+ $out = ob_get_contents();
+ ob_end_clean();
+
+ return $out;
+}
+
+?>
\ No newline at end of file
diff --git a/wp-includes/admin-bar/admin-bar-superadmin.php b/wp-includes/admin-bar/admin-bar-superadmin.php
new file mode 100644
index 0000000000..c93e6a3449
--- /dev/null
+++ b/wp-includes/admin-bar/admin-bar-superadmin.php
@@ -0,0 +1,156 @@
+add_menu( array( 'id' => 'superadmin', 'title' => 'μ', 'href' => '', 'meta' => array( 'class' => 'ab-sadmin' ) ) );
+
+ wp_admin_bar_build_snackmenu();
+
+ /* Get the settings we need for the current blog */
+ $matureaction = $current_blog->mature ? 'unmatureblog' : 'matureblog';
+ $maturetext = $current_blog->mature ? esc_attr__('Unmark as mature') : esc_attr__('Mark as mature');
+ $suspendtext = $current_blog->spam ? esc_attr('Unsuspend blog') : esc_attr('Suspend blog');
+ $suspendaction = $current_blog->spam ? 'unspamblog' : 'spamblog';
+ $mature_url = admin_url( "ms-edit.php?action=confirm&action2={$matureaction}&id={$current_blog->blog_id}&msg=" . urlencode( 'Are you sure you want to ' . strtolower( $maturetext ) . " {$current_blog->domain} as mature?" ) );
+ $suspend_url = admin_url( "ms-edit.php?action=confirm&action2={$suspendaction}&id={$current_blog->blog_id}&msg=" . urlencode( 'Are you sure you want to ' . strtolower( $suspendtext ) . " {$current_blog->domain} ?" ) );
+
+ /* Add the submenu items to the Super Admin menu */
+ $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => __( 'Blog Dashboard' ), 'href' => admin_url(), 'position' => 10 ) );
+ $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => __( 'Blog Options' ), 'href' => admin_url( "ms-sites.php?action=blogs&searchaction=id&s={$current_blog->blog_id}" ), 'position' => 30 ) );
+ $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => "$maturetext", 'href' => $mature_url, 'position' => 50 ) );
+ $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => "$suspendtext", 'href' => $suspend_url, 'position' => 80 ) );
+}
+
+function wp_admin_bar_build_snackmenu() {
+ global $wp_admin_bar, $menu, $submenu, $pagenow;
+
+ if ( !is_object( $wp_admin_bar ) || !is_super_admin() )
+ return false;
+
+ // Hide moderation count, filter removed at the bottom of this function
+ add_filter( 'wp_count_comments', 'wp_admin_bar_removemodcount' );
+
+ require_once( ABSPATH . 'wp-admin/includes/admin.php' );
+
+ // menu.php assumes it is in the global scope and relies on the $wp_taxonomies global array
+ $wp_taxonomies = array();
+ require_once( ABSPATH . 'wp-admin/menu.php' );
+
+ /* Add the snack menu submenu to the superadmin menu */
+ $wp_admin_bar->add_menu( array( 'parent' => 'superadmin', 'title' => 'Snack Menu', 'href' => '/wp-admin/' ) );
+
+ /* Loop through the submenus and add them */
+ foreach ( (array) $menu as $key => $item ) {
+ $admin_is_parent = false;
+ $submenu_as_parent = false;
+
+ if ( $submenu_as_parent && !empty($submenu[$item[2]]) ) {
+ $submenu[$item[2]] = array_values($submenu[$item[2]]); // Re-index.
+ $menu_hook = get_plugin_page_hook($submenu[$item[2]][0][2], $item[2]);
+ $menu_file = $submenu[$item[2]][0][2];
+
+ if ( false !== $pos = strpos($menu_file, '?') )
+ $menu_file = substr($menu_file, 0, $pos);
+ if ( ( ('index.php' != $submenu[$item[2]][0][2]) && file_exists(WP_PLUGIN_DIR . "/$menu_file") ) || !empty($menu_hook)) {
+ $admin_is_parent = true;
+ $wp_admin_bar->add_menu( array( 'parent' => 'snack-menu', 'title' => $item[0], 'href' => admin_url("admin.php?page={$submenu[$item[2]][0][2]}") ) );
+ } else {
+ $wp_admin_bar->add_menu( array( 'parent' => 'snack-menu', 'title' => $item[0], 'href' => admin_url("{$submenu[$item[2]][0][2]}") ) );
+ }
+ } else if ( current_user_can($item[1]) ) {
+ $menu_hook = get_plugin_page_hook($item[2], 'admin.php');
+ $menu_file = $item[2];
+
+ if ( false !== $pos = strpos($menu_file, '?') )
+ $menu_file = substr($menu_file, 0, $pos);
+ if ( ('index.php' != $item[2]) && file_exists(WP_PLUGIN_DIR . "/$menu_file") || !empty($menu_hook) ) {
+ $admin_is_parent = true;
+ $wp_admin_bar->add_menu( array( 'parent' => 'snack-menu', 'title' => $item[0], 'href' => admin_url("admin.php?page={$item[2]}") ) );
+ } else {
+ $wp_admin_bar->add_menu( array( 'parent' => 'snack-menu', 'title' => $item[0], 'href' => admin_url("{$item[2]}") ) );
+ }
+ }
+
+ if ( !empty($submenu[$item[2]]) ) {
+ $first = true;
+ $unique_submenu = array();
+
+ foreach ( $submenu[$item[2]] as $sub_key => $sub_item ) {
+ if ( !current_user_can($sub_item[1]) || in_array( $sub_item[0], $unique_submenu ) )
+ continue;
+
+ $unique_submenu[] = $sub_item[0];
+
+ if ( $first )
+ $first = false;
+
+ $menu_file = $item[2];
+ if ( false !== $pos = strpos($menu_file, '?') )
+ $menu_file = substr($menu_file, 0, $pos);
+
+ $menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);
+ $sub_file = $sub_item[2];
+ if ( false !== $pos = strpos($sub_file, '?') )
+ $sub_file = substr($sub_file, 0, $pos);
+
+ if ( ( ('index.php' != $sub_item[2]) && file_exists(WP_PLUGIN_DIR . "/$sub_file") ) || ! empty($menu_hook) ) {
+ // If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
+
+ $parent_exists = (!$admin_is_parent && file_exists(WP_PLUGIN_DIR . "/$menu_file") && !is_dir(WP_PLUGIN_DIR . "/{$item[2]}") ) || file_exists($menu_file);
+ if ( $parent_exists )
+ $wp_admin_bar->add_menu( array( 'parent' => sanitize_title( $item[0] ), 'title' => $sub_item[0], 'href' => admin_url("{$item[2]}?page={$sub_item[2]}") ) );
+ elseif ( 'admin.php' == $pagenow || !$parent_exists )
+ $wp_admin_bar->add_menu( array( 'parent' => sanitize_title( $item[0] ), 'title' => $sub_item[0], 'href' => admin_url("admin.php?page={$sub_item[2]}") ) );
+ else
+ $wp_admin_bar->add_menu( array( 'parent' => sanitize_title( $item[0] ), 'title' => $sub_item[0], 'href' => admin_url("{$item[2]}?page={$sub_item[2]}") ) );
+ } else {
+ $wp_admin_bar->add_menu( array( 'parent' => sanitize_title( $item[0] ), 'title' => $sub_item[0], 'href' => admin_url("{$sub_item[2]}") ) );
+ }
+ }
+ }
+ }
+
+ remove_filter( 'wp_count_comments', 'wp_admin_bar_removemodcount' );
+}
+
+// Short circuits wp_count_comments() for the front end
+function wp_admin_bar_removemodcount( $stats ) {
+ if ( is_admin() )
+ return $stats;
+
+ $stats = array(
+ 'moderated' => 0,
+ 'approved' => 0,
+ 'spam' => 0,
+ 'trash' => 0,
+ 'post-trashed' => 0,
+ 'total_comments' => 0,
+ );
+
+ return (object) $stats;
+}
+
+?>
diff --git a/wp-includes/images/admin-bar-sprite-rtl.png b/wp-includes/images/admin-bar-sprite-rtl.png
new file mode 100644
index 0000000000..8f5362210f
Binary files /dev/null and b/wp-includes/images/admin-bar-sprite-rtl.png differ
diff --git a/wp-includes/images/admin-bar-sprite.png b/wp-includes/images/admin-bar-sprite.png
new file mode 100644
index 0000000000..cd5aa77c18
Binary files /dev/null and b/wp-includes/images/admin-bar-sprite.png differ
diff --git a/wp-includes/images/wpmini-blue.png b/wp-includes/images/wpmini-blue.png
new file mode 100644
index 0000000000..13f3fa64dd
Binary files /dev/null and b/wp-includes/images/wpmini-blue.png differ
diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index cbd765be99..8cb2b0a87b 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -30,46 +30,6 @@ function get_admin_users_for_domain( $sitedomain = '', $path = '' ) {
return false;
}
-function get_blogs_of_user( $id, $all = false ) {
- global $wpdb;
-
- $cache_suffix = $all ? '_all' : '_short';
- $return = wp_cache_get( 'blogs_of_user_' . $id . $cache_suffix, 'users' );
- if ( $return )
- return apply_filters( 'get_blogs_of_user', $return, $id, $all );
-
- $user = get_userdata( (int) $id );
- if ( !$user )
- return false;
-
- $blogs = $match = array();
- $prefix_length = strlen($wpdb->base_prefix);
- foreach ( (array) $user as $key => $value ) {
- if ( $prefix_length && substr($key, 0, $prefix_length) != $wpdb->base_prefix )
- continue;
- if ( substr($key, -12, 12) != 'capabilities' )
- continue;
- if ( preg_match( '/^' . $wpdb->base_prefix . '((\d+)_)?capabilities$/', $key, $match ) ) {
- if ( count( $match ) > 2 )
- $blog_id = $match[ 2 ];
- else
- $blog_id = 1;
- $blog = get_blog_details( $blog_id );
- if ( $blog && isset( $blog->domain ) && ( $all == true || $all == false && ( $blog->archived == 0 && $blog->spam == 0 && $blog->deleted == 0 ) ) ) {
- $blogs[ $blog_id ]->userblog_id = $blog_id;
- $blogs[ $blog_id ]->blogname = $blog->blogname;
- $blogs[ $blog_id ]->domain = $blog->domain;
- $blogs[ $blog_id ]->path = $blog->path;
- $blogs[ $blog_id ]->site_id = $blog->site_id;
- $blogs[ $blog_id ]->siteurl = $blog->siteurl;
- }
- }
- }
-
- wp_cache_add( 'blogs_of_user_' . $id . $cache_suffix, $blogs, 'users', 5 );
- return apply_filters( 'get_blogs_of_user', $blogs, $id, $all );
-}
-
function get_active_blog_for_user( $user_id ) { // get an active blog for user - either primary blog or from blogs list
global $wpdb;
$blogs = get_blogs_of_user( $user_id );
@@ -366,21 +326,6 @@ function wpmu_admin_redirect_add_updated_param( $url = '' ) {
return $url;
}
-function is_blog_user( $blog_id = 0 ) {
- global $wpdb;
-
- $current_user = wp_get_current_user();
- if ( !$blog_id )
- $blog_id = $wpdb->blogid;
-
- $cap_key = $wpdb->base_prefix . $blog_id . '_capabilities';
-
- if ( is_array($current_user->$cap_key) && in_array(1, $current_user->$cap_key) )
- return true;
-
- return false;
-}
-
function is_email_address_unsafe( $user_email ) {
$banned_names = get_site_option( 'banned_email_domains' );
if ($banned_names && !is_array( $banned_names ))
diff --git a/wp-includes/user.php b/wp-includes/user.php
index 621fb978a1..ef5b1e010d 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -574,6 +574,167 @@ function get_users_of_blog( $id = '' ) {
return get_users( array( 'blog_id' => $id ) );
}
+/**
+ * Get the blogs a user belong to.
+ *
+ * $since 3.0.0
+ *
+ * @param int $id User Id
+ * @param bool $all Whether to retrieve all blog details or an abbreviated set of details. Default is abbreviated.
+ * @return array A list of the user's blogs.
+ */
+function get_blogs_of_user( $id, $all = false ) {
+ global $wpdb;
+
+ if ( !is_multisite() ) {
+ global $blog_id;
+ $blogs = array();
+ $blogs[ $blog_id ]->userblog_id = $blog_id;
+ $blogs[ $blog_id ]->blogname = get_option('blogname');
+ $blogs[ $blog_id ]->domain = '';
+ $blogs[ $blog_id ]->path = '';
+ $blogs[ $blog_id ]->site_id = 1;
+ $blogs[ $blog_id ]->siteurl = get_option('siteurl');
+ return $blogs;
+ }
+
+ $cache_suffix = $all ? '_all' : '_short';
+ $return = wp_cache_get( 'blogs_of_user_' . $id . $cache_suffix, 'users' );
+ if ( $return )
+ return apply_filters( 'get_blogs_of_user', $return, $id, $all );
+
+ $user = get_userdata( (int) $id );
+ if ( !$user )
+ return false;
+
+ $blogs = $match = array();
+ $prefix_length = strlen($wpdb->base_prefix);
+ foreach ( (array) $user as $key => $value ) {
+ if ( $prefix_length && substr($key, 0, $prefix_length) != $wpdb->base_prefix )
+ continue;
+ if ( substr($key, -12, 12) != 'capabilities' )
+ continue;
+ if ( preg_match( '/^' . $wpdb->base_prefix . '((\d+)_)?capabilities$/', $key, $match ) ) {
+ if ( count( $match ) > 2 )
+ $blog_id = $match[ 2 ];
+ else
+ $blog_id = 1;
+ $blog = get_blog_details( $blog_id );
+ if ( $blog && isset( $blog->domain ) && ( $all == true || $all == false && ( $blog->archived == 0 && $blog->spam == 0 && $blog->deleted == 0 ) ) ) {
+ $blogs[ $blog_id ]->userblog_id = $blog_id;
+ $blogs[ $blog_id ]->blogname = $blog->blogname;
+ $blogs[ $blog_id ]->domain = $blog->domain;
+ $blogs[ $blog_id ]->path = $blog->path;
+ $blogs[ $blog_id ]->site_id = $blog->site_id;
+ $blogs[ $blog_id ]->siteurl = $blog->siteurl;
+ }
+ }
+ }
+
+ wp_cache_add( 'blogs_of_user_' . $id . $cache_suffix, $blogs, 'users', 5 );
+ return apply_filters( 'get_blogs_of_user', $blogs, $id, $all );
+}
+
+function get_ordered_blogs_of_user( $user_id, $visibility = true ) {
+ $newblogs = $ordered = array();
+ $blogs = get_blogs_of_user( $user_id );
+ $order_meta = get_user_meta( $user_id, 'blog_order' );
+ $visible_meta = get_user_meta( $user_id, 'blog_visibility' );
+
+ $order = $order_meta;
+ if ( !is_array( $order ) )
+ $order = array();
+
+ $visible = $visible_meta;
+ if ( !is_array( $visible ) )
+ $visible = array();
+
+ // Index the blogs by userblog_id and set the visibility flag
+ // Visibility is on by default, unless a linked site then off
+ foreach ( $blogs AS $blog ) {
+ $blog->visible = true;
+
+ if ( isset( $visible[$blog->userblog_id] ) )
+ $blog->visible = $visible[$blog->userblog_id];
+
+ $newblogs[$blog->userblog_id] = $blog;
+ }
+
+ // Add the blogs to our list by order
+ foreach ( (array)$order AS $id ) {
+ // A previous change was saving the entire blog details into ordered, not just the blog ID - this detects it
+ if ( is_object( $id ) && isset( $id->userblog_id ) )
+ $id = $id->userblog_id;
+
+ if ( is_numeric( $id ) && isset( $newblogs[intval( $id )] ) ) {
+ $ordered[$id] = $newblogs[$id];
+ unset( $newblogs[$id] );
+ }
+ }
+
+ // Add any blog not yet ordered to the end
+ foreach ( $newblogs AS $blog ) {
+ $ordered[$blog->userblog_id] = $blog;
+ }
+
+ // If we're only interested in visible blogs then remove the rest
+ if ( $visibility ) {
+ foreach ( (array)$ordered AS $pos => $blog ) {
+ if ( $blog->visible == false )
+ unset( $ordered[$pos] );
+ }
+ }
+
+/*
+ // Set the order and visible options if the user doesn't have any,
+ // but rate limit it so that the global DB doesn't get hammered
+ if ( !is_array( $order_meta ) && ( 1 == mt_rand( 1, 10 ) ) )
+ update_usermeta( $user_id, 'blog_order', array() );
+
+ if ( !is_array( $visible_meta ) && ( 1 == mt_rand( 1, 10 ) ) )
+ update_usermeta( $user_id, 'blog_visibility', array() );
+*/
+
+ return apply_filters( 'ordered_blogs', $ordered );
+}
+
+function set_blog_visibility( $blog_id, $visible ) {
+ global $current_user;
+
+ if ( is_blog_user( $blog_id ) ) {
+ $visibility = get_user_meta( $current_user->ID, 'blog_visibility' );
+ if ( !is_array( $visibility ) )
+ $visibility = array();
+
+ $visibility[$blog_id] = $visible;
+
+ update_user_meta( $current_user->ID, 'blog_visibility', $visibility );
+ }
+}
+
+/**
+ * Checks if the current user belong to a given blog.
+ *
+ * @since 3.0.0
+ *
+ * @param int $blog_id Blog ID
+ * @return bool True if the current users belong to $blog_id, false if not.
+ */
+function is_blog_user( $blog_id = 0 ) {
+ global $wpdb;
+
+ $current_user = wp_get_current_user();
+ if ( !$blog_id )
+ $blog_id = $wpdb->blogid;
+
+ $cap_key = $wpdb->base_prefix . $blog_id . '_capabilities';
+
+ if ( is_array($current_user->$cap_key) && in_array(1, $current_user->$cap_key) )
+ return true;
+
+ return false;
+}
+
/**
* Add meta data field to a user.
*
diff --git a/wp-settings.php b/wp-settings.php
index bdfc58a5cb..6e35a8e6e7 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -133,6 +133,7 @@ require( ABSPATH . WPINC . '/class-http.php' );
require( ABSPATH . WPINC . '/widgets.php' );
require( ABSPATH . WPINC . '/nav-menu.php' );
require( ABSPATH . WPINC . '/nav-menu-template.php' );
+require( ABSPATH . WPINC . '/admin-bar.php' );
// Load multisite-specific files.
if ( is_multisite() ) {