WordPress 3.8
[autoinstalls/wordpress.git] / wp-admin / includes / dashboard.php
index b08615f93d3768ea9c4fdb1b8225b37c28e4519a..afc76f0d1541364af028ba877e999237d4dbf650 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /**
- * WordPress Dashboard Widget Administration Panel API
+ * WordPress Dashboard Widget Administration Screen API
  *
  * @package WordPress
  * @subpackage Administration
@@ -9,13 +9,14 @@
 /**
  * Registers dashboard widgets.
  *
- * handles POST data, sets up filters.
+ * Handles POST data, sets up filters.
  *
- * @since unknown
+ * @since 2.5.0
  */
 function wp_dashboard_setup() {
        global $wp_registered_widgets, $wp_registered_widget_controls, $wp_dashboard_control_callbacks;
        $wp_dashboard_control_callbacks = array();
+       $screen = get_current_screen();
 
        $update = false;
        $widget_options = get_option( 'dashboard_widget_options' );
@@ -24,70 +25,49 @@ function wp_dashboard_setup() {
 
        /* Register Widgets and Controls */
 
-       // Right Now
-       wp_add_dashboard_widget( 'dashboard_right_now', __( 'Right Now' ), 'wp_dashboard_right_now' );
-
-       // Recent Comments Widget
-       $recent_comments_title = __( 'Recent Comments' );
-       wp_add_dashboard_widget( 'dashboard_recent_comments', $recent_comments_title, 'wp_dashboard_recent_comments' );
-
-       // Incoming Links Widget
-       if ( !isset( $widget_options['dashboard_incoming_links'] ) || !isset( $widget_options['dashboard_incoming_links']['home'] ) || $widget_options['dashboard_incoming_links']['home'] != get_option('home') ) {
-               $update = true;
-               $widget_options['dashboard_incoming_links'] = array(
-                       'home' => get_option('home'),
-                       'link' => apply_filters( 'dashboard_incoming_links_link', 'http://blogsearch.google.com/blogsearch?hl=en&scoring=d&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ),
-                       'url' => apply_filters( 'dashboard_incoming_links_feed', 'http://blogsearch.google.com/blogsearch_feeds?hl=en&scoring=d&ie=utf-8&num=10&output=rss&partner=wordpress&q=link:' . trailingslashit( get_option('home') ) ),
-                       'items' => isset($widget_options['dashboard_incoming_links']['items']) ? $widget_options['dashboard_incoming_links']['items'] : 10,
-                       'show_date' => isset($widget_options['dashboard_incoming_links']['show_date']) ? $widget_options['dashboard_incoming_links']['show_date'] : false
-               );
+       $response = wp_check_browser_version();
+
+       if ( $response && $response['upgrade'] ) {
+               add_filter( 'postbox_classes_dashboard_dashboard_browser_nag', 'dashboard_browser_nag_class' );
+               if ( $response['insecure'] )
+                       wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'You are using an insecure browser!' ), 'wp_dashboard_browser_nag' );
+               else
+                       wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'Your browser is out of date!' ), 'wp_dashboard_browser_nag' );
        }
-       wp_add_dashboard_widget( 'dashboard_incoming_links', __( 'Incoming Links' ), 'wp_dashboard_incoming_links', 'wp_dashboard_incoming_links_control' );
 
-       // WP Plugins Widget
-       if ( current_user_can( 'activate_plugins' ) )
-               wp_add_dashboard_widget( 'dashboard_plugins', __( 'Plugins' ), 'wp_dashboard_plugins' );
+       // Right Now
+       if ( is_blog_admin() && current_user_can('edit_posts') )
+               wp_add_dashboard_widget( 'dashboard_right_now', __( 'At a Glance' ), 'wp_dashboard_right_now' );
+
+       if ( is_network_admin() )
+               wp_add_dashboard_widget( 'network_dashboard_right_now', __( 'Right Now' ), 'wp_network_dashboard_right_now' );
 
-       // QuickPress Widget
-       if ( current_user_can('edit_posts') )
-               wp_add_dashboard_widget( 'dashboard_quick_press', __( 'QuickPress' ), 'wp_dashboard_quick_press' );
-
-       // Recent Drafts
-       if ( current_user_can('edit_posts') )
-               wp_add_dashboard_widget( 'dashboard_recent_drafts', __('Recent Drafts'), 'wp_dashboard_recent_drafts' );
-
-       // Primary feed (Dev Blog) Widget
-       if ( !isset( $widget_options['dashboard_primary'] ) ) {
-               $update = true;
-               $widget_options['dashboard_primary'] = array(
-                       'link' => apply_filters( 'dashboard_primary_link',  __( 'http://wordpress.org/development/' ) ),
-                       'url' => apply_filters( 'dashboard_primary_feed',  __( 'http://wordpress.org/development/feed/' ) ),
-                       'title' => apply_filters( 'dashboard_primary_title', __( 'WordPress Development Blog' ) ),
-                       'items' => 2,
-                       'show_summary' => 1,
-                       'show_author' => 0,
-                       'show_date' => 1
-               );
+       // Activity Widget
+       if ( is_blog_admin() ) {
+               wp_add_dashboard_widget( 'dashboard_activity', __( 'Activity' ), 'wp_dashboard_site_activity' );
        }
-       wp_add_dashboard_widget( 'dashboard_primary', $widget_options['dashboard_primary']['title'], 'wp_dashboard_primary', 'wp_dashboard_primary_control' );
-
-       // Secondary Feed (Planet) Widget
-       if ( !isset( $widget_options['dashboard_secondary'] ) ) {
-               $update = true;
-               $widget_options['dashboard_secondary'] = array(
-                       'link' => apply_filters( 'dashboard_secondary_link',  __( 'http://planet.wordpress.org/' ) ),
-                       'url' => apply_filters( 'dashboard_secondary_feed',  __( 'http://planet.wordpress.org/feed/' ) ),
-                       'title' => apply_filters( 'dashboard_secondary_title', __( 'Other WordPress News' ) ),
-                       'items' => 5
-               );
+
+       // QuickPress Widget
+       if ( is_blog_admin() && current_user_can( 'edit_posts' ) ) {
+               $quick_draft_title = sprintf( '<span class="hide-if-no-js">%1$s</span> <span class="hide-if-js">%2$s</span>', __( 'Quick Draft' ), __( 'Drafts' ) );
+               wp_add_dashboard_widget( 'dashboard_quick_press', $quick_draft_title, 'wp_dashboard_quick_press' );
        }
-       wp_add_dashboard_widget( 'dashboard_secondary', $widget_options['dashboard_secondary']['title'], 'wp_dashboard_secondary', 'wp_dashboard_secondary_control' );
 
-       // Hook to register new widgets
-       do_action( 'wp_dashboard_setup' );
+       // WordPress News
+       wp_add_dashboard_widget( 'dashboard_primary', __( 'WordPress News' ), 'wp_dashboard_primary' );
 
+       // Hook to register new widgets
        // Filter widget order
-       $dashboard_widgets = apply_filters( 'wp_dashboard_widgets', array() );
+       if ( is_network_admin() ) {
+               do_action( 'wp_network_dashboard_setup' );
+               $dashboard_widgets = apply_filters( 'wp_network_dashboard_widgets', array() );
+       } elseif ( is_user_admin() ) {
+               do_action( 'wp_user_dashboard_setup' );
+               $dashboard_widgets = apply_filters( 'wp_user_dashboard_widgets', array() );
+       } else {
+               do_action( 'wp_dashboard_setup' );
+               $dashboard_widgets = apply_filters( 'wp_dashboard_widgets', array() );
+       }
 
        foreach ( $dashboard_widgets as $widget_id ) {
                $name = empty( $wp_registered_widgets[$widget_id]['all_link'] ) ? $wp_registered_widgets[$widget_id]['name'] : $wp_registered_widgets[$widget_id]['name'] . " <a href='{$wp_registered_widgets[$widget_id]['all_link']}' class='edit-box open-box'>" . __('View all') . '</a>';
@@ -95,6 +75,7 @@ function wp_dashboard_setup() {
        }
 
        if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget_id']) ) {
+               check_admin_referer( 'edit-dashboard-widget_' . $_POST['widget_id'], 'dashboard-widget-nonce' );
                ob_start(); // hack - but the same hack wp-admin/widgets.php uses
                wp_dashboard_trigger_widget_control( $_POST['widget_id'] );
                ob_end_clean();
@@ -105,403 +86,379 @@ function wp_dashboard_setup() {
        if ( $update )
                update_option( 'dashboard_widget_options', $widget_options );
 
-       do_action('do_meta_boxes', 'dashboard', 'normal', '');
-       do_action('do_meta_boxes', 'dashboard', 'side', '');
+       /** This action is documented in wp-admin/edit-form-advanced.php */
+       do_action('do_meta_boxes', $screen->id, 'normal', '');
+       /** This action is documented in wp-admin/edit-form-advanced.php */
+       do_action('do_meta_boxes', $screen->id, 'side', '');
 }
 
-function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_callback = null ) {
+function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_callback = null, $callback_args = null ) {
+       $screen = get_current_screen();
        global $wp_dashboard_control_callbacks;
+
        if ( $control_callback && current_user_can( 'edit_dashboard' ) && is_callable( $control_callback ) ) {
                $wp_dashboard_control_callbacks[$widget_id] = $control_callback;
                if ( isset( $_GET['edit'] ) && $widget_id == $_GET['edit'] ) {
                        list($url) = explode( '#', add_query_arg( 'edit', false ), 2 );
-                       $widget_name .= ' <span class="postbox-title-action"><a href="' . clean_url( $url ) . '">' . __( 'Cancel' ) . '</a></span>';
-                       add_meta_box( $widget_id, $widget_name, '_wp_dashboard_control_callback', 'dashboard', 'normal', 'core' );
-                       return;
+                       $widget_name .= ' <span class="postbox-title-action"><a href="' . esc_url( $url ) . '">' . __( 'Cancel' ) . '</a></span>';
+                       $callback = '_wp_dashboard_control_callback';
+               } else {
+                       list($url) = explode( '#', add_query_arg( 'edit', $widget_id ), 2 );
+                       $widget_name .= ' <span class="postbox-title-action"><a href="' . esc_url( "$url#$widget_id" ) . '" class="edit-box open-box">' . __( 'Configure' ) . '</a></span>';
                }
-               list($url) = explode( '#', add_query_arg( 'edit', $widget_id ), 2 );
-               $widget_name .= ' <span class="postbox-title-action"><a href="' . clean_url( "$url#$widget_id" ) . '" class="edit-box open-box">' . __( 'Configure' ) . '</a></span>';
        }
-       $side_widgets = array('dashboard_quick_press', 'dashboard_recent_drafts', 'dashboard_primary', 'dashboard_secondary');
+
+       $side_widgets = array( 'dashboard_quick_press', 'dashboard_primary' );
+
        $location = 'normal';
        if ( in_array($widget_id, $side_widgets) )
                $location = 'side';
-       add_meta_box( $widget_id, $widget_name , $callback, 'dashboard', $location, 'core' );
+
+       $priority = 'core';
+       if ( 'dashboard_browser_nag' === $widget_id )
+               $priority = 'high';
+
+       add_meta_box( $widget_id, $widget_name, $callback, $screen, $location, $priority, $callback_args );
 }
 
 function _wp_dashboard_control_callback( $dashboard, $meta_box ) {
        echo '<form action="" method="post" class="dashboard-widget-control-form">';
        wp_dashboard_trigger_widget_control( $meta_box['id'] );
-       echo "<p class='submit'><input type='hidden' name='widget_id' value='$meta_box[id]' /><input type='submit' value='" . __( 'Submit' ) . "' /></p>";
-
+       wp_nonce_field( 'edit-dashboard-widget_' . $meta_box['id'], 'dashboard-widget-nonce' );
+       echo '<input type="hidden" name="widget_id" value="' . esc_attr($meta_box['id']) . '" />';
+       submit_button( __('Submit') );
        echo '</form>';
 }
 
 /**
  * Displays the dashboard.
  *
- * @since unknown
+ * @since 2.5.0
  */
 function wp_dashboard() {
-       echo "<div id='dashboard-widgets' class='metabox-holder'>\n\n";
-
-       echo "<div id='side-info-column' class='inner-sidebar'>\n\n";
-       $class = do_meta_boxes( 'dashboard', 'side', '' ) ? ' class="has-sidebar"' : '';
-       echo "</div>\n\n";
+       $screen = get_current_screen();
+       $columns = absint( $screen->get_columns() );
+       $columns_css = '';
+       if ( $columns ) {
+               $columns_css = " columns-$columns";
+       }
 
-       echo "<div id='post-body'$class>\n\n";
-       echo "<div id='dashboard-widgets-main-content' class='has-sidebar-content'>\n\n";
-       do_meta_boxes( 'dashboard', 'normal', '' );
-       echo "</div>\n\n";
-       echo "</div>\n\n";
+?>
+<div id="dashboard-widgets" class="metabox-holder<?php echo $columns_css; ?>">
+       <div id='postbox-container-1' class='postbox-container'>
+       <?php do_meta_boxes( $screen->id, 'normal', '' ); ?>
+       </div>
+       <div id='postbox-container-2' class='postbox-container'>
+       <?php do_meta_boxes( $screen->id, 'side', '' ); ?>
+       </div>
+       <div id='postbox-container-3' class='postbox-container'>
+       <?php do_meta_boxes( $screen->id, 'column3', '' ); ?>
+       </div>
+       <div id='postbox-container-4' class='postbox-container'>
+       <?php do_meta_boxes( $screen->id, 'column4', '' ); ?>
+       </div>
+</div>
 
-       echo "<form style='display: none' method='get' action=''>\n<p>\n";
+<?php
        wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
        wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
-       echo "</p>\n</form>\n";
 
-       echo "</div>";
 }
 
 /* Dashboard Widgets */
 
+/**
+ * Dashboard widget that displays some basic stats about the site.
+ *
+ * Formerly 'Right Now'. A streamlined 'At a Glance' as of 3.8.
+ *
+ * @since 2.7.0
+ */
 function wp_dashboard_right_now() {
-       $num_posts = wp_count_posts( 'post' );
-       $num_pages = wp_count_posts( 'page' );
-
-       $num_cats  = wp_count_terms('category');
-
-       $num_tags = wp_count_terms('post_tag');
-
-       $num_comm = wp_count_comments( );
-
-       echo "\n\t".'<p class="sub">' . __('At a Glance') . '</p>';
-       echo "\n\t".'<div class="table">'."\n\t".'<table>';
-       echo "\n\t".'<tr class="first">';
-
-       // Posts
-       $num = number_format_i18n( $num_posts->publish );
-       $text = __ngettext( 'Post', 'Posts', intval($num_posts->publish) );
-       if ( current_user_can( 'edit_posts' ) ) {
-               $num = "<a href='edit.php'>$num</a>";
-               $text = "<a href='edit.php'>$text</a>";
-       }
-       echo '<td class="first b b-posts">' . $num . '</td>';
-       echo '<td class="t posts">' . $text . '</td>';
-       /* TODO: Show status breakdown on hover
-       if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds.  Don't show if !current_user_can
-               $post_type_texts[] = '<a href="edit-pages.php">'.sprintf( __ngettext( '%s page', '%s pages', $num_pages->publish ), number_format_i18n( $num_pages->publish ) ).'</a>';
-       }
-       if ( $can_edit_posts && !empty($num_posts->draft) ) {
-               $post_type_texts[] = '<a href="edit.php?post_status=draft">'.sprintf( __ngettext( '%s draft', '%s drafts', $num_posts->draft ), number_format_i18n( $num_posts->draft ) ).'</a>';
+       $theme = wp_get_theme();
+       if ( current_user_can( 'switch_themes' ) )
+               $theme_name = sprintf( '<a href="themes.php">%1$s</a>', $theme->display('Name') );
+       else
+               $theme_name = $theme->display('Name');
+?>
+       <div class="main">
+       <ul>
+       <?php
+       // Posts and Pages
+       foreach ( array( 'post', 'page' ) as $post_type ) {
+               $num_posts = wp_count_posts( $post_type );
+               if ( $num_posts && $num_posts->publish ) {
+                       if ( 'post' == $post_type ) {
+                               $text = _n( '%s Post', '%s Posts', $num_posts->publish );
+                       } else {
+                               $text = _n( '%s Page', '%s Pages', $num_posts->publish );
+                       }
+                       $text = sprintf( $text, number_format_i18n( $num_posts->publish ) );
+                       printf( '<li class="%1$s-count"><a href="edit.php?post_type=%1$s">%2$s</a></li>', $post_type, $text );
+               }
        }
-       if ( $can_edit_posts && !empty($num_posts->future) ) {
-               $post_type_texts[] = '<a href="edit.php?post_status=future">'.sprintf( __ngettext( '%s scheduled post', '%s scheduled posts', $num_posts->future ), number_format_i18n( $num_posts->future ) ).'</a>';
+       // Comments
+       $num_comm = wp_count_comments();
+       if ( $num_comm && $num_comm->total_comments ) {
+               $text = sprintf( _n( '%s Comment', '%s Comments', $num_comm->total_comments ), number_format_i18n( $num_comm->total_comments ) );
+               ?>
+               <li class="comment-count"><a href="edit-comments.php"><?php echo $text; ?></a></li>
+               <?php
+               if ( $num_comm->moderated ) {
+                       /* translators: Number of comments in moderation */
+                       $text = sprintf( _nx( '%s in moderation', '%s in moderation', $num_comm->moderated, 'comments' ), number_format_i18n( $num_comm->moderated ) );
+                       ?>
+                       <li class="comment-mod-count"><a href="edit-comments.php?comment_status=moderated"><?php echo $text; ?></a></li>
+                       <?php
+               }
        }
-       if ( current_user_can('publish_posts') && !empty($num_posts->pending) ) {
-               $pending_text = sprintf( __ngettext( 'There is <a href="%1$s">%2$s post</a> pending your review.', 'There are <a href="%1$s">%2$s posts</a> pending your review.', $num_posts->pending ), 'edit.php?post_status=pending', number_format_i18n( $num_posts->pending ) );
-       } else {
-               $pending_text = '';
+
+       /**
+        * Include additional elements in the 'At a Glance' dashboard widget.
+        * This widget was previously 'Right Now'.
+        *
+        * @since 3.8.0
+        * @param array $items Array of items.
+        */
+       $elements = apply_filters( 'dashboard_glance_items', array() );
+       if ( $elements ) {
+               echo '<li>' . implode( "</li>\n<li>", $elements ) . "</li>\n";
        }
-       */
-
-       // Total Comments
-       $num = number_format_i18n($num_comm->total_comments);
-       $text = __ngettext( 'Comment', 'Comments', $num_comm->total_comments );
-       if ( current_user_can( 'moderate_comments' ) ) {
-               $num = "<a href='edit-comments.php'>$num</a>";
-               $text = "<a href='edit-comments.php'>$text</a>";
+
+       ?>
+       </ul>
+       <p><?php printf( __( 'WordPress %1$s running %2$s theme.' ), get_bloginfo( 'version', 'display' ), $theme_name ); ?></p>
+       <?php
+
+       // Check if search engines are asked not to index this site.
+       if ( ! is_network_admin() && ! is_user_admin() && current_user_can( 'manage_options' ) && '1' != get_option( 'blog_public' ) ) {
+
+               /**
+                * Filter the title attribute for the link displayed in Site Content metabox when search engines are discouraged from indexing the site.
+                *
+                * @since 3.0.0
+                *
+                * @param string Default attribute text.
+                */
+               $title = apply_filters( 'privacy_on_link_title', __( 'Your site is asking search engines not to index its content' ) );
+
+               /**
+                * Filter the text for the link displayed in Site Content metabox when search engines are discouraged from indexing the site.
+                *
+                * @since 3.0.0
+                *
+                * @param string Default text.
+                */
+               $content = apply_filters( 'privacy_on_link_text' , __( 'Search Engines Discouraged' ) );
+
+               echo "<p><a href='options-reading.php' title='$title'>$content</a></p>";
        }
-       echo '<td class="b b-comments">' . $num . '</td>';
-       echo '<td class="last t comments">' . $text . '</td>';
+       ?>
+       </div>
+       <?php
+       // activity_box_end has a core action, but only prints content when multisite.
+       // Using an output buffer is the only way to really check if anything's displayed here.
+       ob_start();
+       do_action( 'rightnow_end' );
+       do_action( 'activity_box_end' );
+       $actions = ob_get_clean();
 
-       echo '</tr><tr>';
+       if ( !empty( $actions ) ) : ?>
+       <div class="sub">
+               <?php echo $actions; ?>
+       </div>
+       <?php endif;
+}
 
-       // Pages
-       $num = number_format_i18n( $num_pages->publish );
-       $text = __ngettext( 'Page', 'Pages', $num_pages->publish );
-       if ( current_user_can( 'edit_pages' ) ) {
-               $num = "<a href='edit-pages.php'>$num</a>";
-               $text = "<a href='edit-pages.php'>$text</a>";
-       }
-       echo '<td class="first b b_pages">' . $num . '</td>';
-       echo '<td class="t pages">' . $text . '</td>';
-
-       // Approved Comments
-       $num = number_format_i18n($num_comm->approved);
-       $text = __ngettext( 'Approved', 'Approved', $num_comm->approved );
-       if ( current_user_can( 'moderate_comments' ) ) {
-               $num = "<a href='edit-comments.php?comment_status=approved'>$num</a>";
-               $text = "<a class='approved' href='edit-comments.php?comment_status=approved'>$text</a>";
-       }
-       echo '<td class="b b_approved">' . $num . '</td>';
-       echo '<td class="last t">' . $text . '</td>';
+function wp_network_dashboard_right_now() {
+       $actions = array();
+       if ( current_user_can('create_sites') )
+               $actions['create-site'] = '<a href="' . network_admin_url('site-new.php') . '">' . __( 'Create a New Site' ) . '</a>';
+       if ( current_user_can('create_users') )
+               $actions['create-user'] = '<a href="' . network_admin_url('user-new.php') . '">' . __( 'Create a New User' ) . '</a>';
 
-       echo "</tr>\n\t<tr>";
+       $c_users = get_user_count();
+       $c_blogs = get_blog_count();
 
-       // Categories
-       $num = number_format_i18n( $num_cats );
-       $text = __ngettext( 'Category', 'Categories', $num_cats );
-       if ( current_user_can( 'manage_categories' ) ) {
-               $num = "<a href='categories.php'>$num</a>";
-               $text = "<a href='categories.php'>$text</a>";
-       }
-       echo '<td class="first b b-cats">' . $num . '</td>';
-       echo '<td class="t cats">' . $text . '</td>';
-
-       // Pending Comments
-       $num = number_format_i18n($num_comm->moderated);
-       $text = __ngettext( 'Pending', 'Pending', $num_comm->moderated );
-       if ( current_user_can( 'moderate_comments' ) ) {
-               $num = "<a href='edit-comments.php?comment_status=moderated'><span class='pending-count'>$num</span></a>";
-               $text = "<a class='waiting' href='edit-comments.php?comment_status=moderated'>$text</a>";
-       }
-       echo '<td class="b b-waiting">' . $num . '</td>';
-       echo '<td class="last t">' . $text . '</td>';
+       $user_text = sprintf( _n( '%s user', '%s users', $c_users ), number_format_i18n( $c_users ) );
+       $blog_text = sprintf( _n( '%s site', '%s sites', $c_blogs ), number_format_i18n( $c_blogs ) );
 
-       echo "</tr>\n\t<tr>";
+       $sentence = sprintf( __( 'You have %1$s and %2$s.' ), $blog_text, $user_text );
 
-       // Tags
-       $num = number_format_i18n( $num_tags );
-       $text = __ngettext( 'Tag', 'Tags', $num_tags );
-       if ( current_user_can( 'manage_categories' ) ) {
-               $num = "<a href='edit-tags.php'>$num</a>";
-               $text = "<a href='edit-tags.php'>$text</a>";
-       }
-       echo '<td class="first b b-tags">' . $num . '</td>';
-       echo '<td class="t tags">' . $text . '</td>';
-
-       // Spam Comments
-       $num = number_format_i18n($num_comm->spam);
-       $text = __ngettext( 'Spam', 'Spam', $num_comm->spam );
-       if ( current_user_can( 'moderate_comments' ) ) {
-               $num = "<a href='edit-comments.php?comment_status=spam'><span class='spam-count'>$num</span></a>";
-               $text = "<a class='spam' href='edit-comments.php?comment_status=spam'>$text</a>";
-       }
-       echo '<td class="b b-spam">' . $num . '</td>';
-       echo '<td class="last t">' . $text . '</td>';
-
-       echo "</tr>";
-       do_action('right_now_table_end');
-       echo "\n\t</table>\n\t</div>";
-
-       echo "\n\t".'<div class="versions">';
-       $ct = current_theme_info();
-       $sidebars_widgets = wp_get_sidebars_widgets();
-       $num_widgets = array_reduce( $sidebars_widgets, create_function( '$prev, $curr', 'return $prev+count($curr);' ), 0 );
-       $num = number_format_i18n( $num_widgets );
-
-       echo "\n\t<p>";
-       if ( current_user_can( 'switch_themes' ) ) {
-               echo '<a href="themes.php" class="button rbutton">' . __('Change Theme') . '</a>';
-               printf(__ngettext('Theme <span class="b"><a href="themes.php">%1$s</a></span> with <span class="b"><a href="widgets.php">%2$s Widget</a></span>', 'Theme <span class="b"><a href="themes.php">%1$s</a></span> with <span class="b"><a href="widgets.php">%2$s Widgets</a></span>', $num_widgets), $ct->title, $num);
-       } else {
-               printf(__ngettext('Theme <span class="b">%1$s</span> with <span class="b">%2$s Widget</span>', 'Theme <span class="b">%1$s</span> with <span class="b">%2$s Widgets</span>', $num_widgets), $ct->title, $num);
+       if ( $actions ) {
+               echo '<ul class="subsubsub">';
+               foreach ( $actions as $class => $action ) {
+                        $actions[ $class ] = "\t<li class='$class'>$action";
+               }
+               echo implode( " |</li>\n", $actions ) . "</li>\n";
+               echo '</ul>';
        }
+?>
+       <br class="clear" />
 
-       echo '</p>';
+       <p class="youhave"><?php echo $sentence; ?></p>
+       <?php do_action( 'wpmuadminresult', '' ); ?>
 
-       update_right_now_message();
+       <form action="<?php echo network_admin_url('users.php'); ?>" method="get">
+               <p>
+                       <input type="search" name="s" value="" size="30" autocomplete="off" />
+                       <?php submit_button( __( 'Search Users' ), 'button', 'submit', false, array( 'id' => 'submit_users' ) ); ?>
+               </p>
+       </form>
 
-       echo "\n\t".'<br class="clear" /></div>';
-       do_action( 'rightnow_end' );
-       do_action( 'activity_box_end' );
+       <form action="<?php echo network_admin_url('sites.php'); ?>" method="get">
+               <p>
+                       <input type="search" name="s" value="" size="30" autocomplete="off" />
+                       <?php submit_button( __( 'Search Sites' ), 'button', 'submit', false, array( 'id' => 'submit_sites' ) ); ?>
+               </p>
+       </form>
+<?php
+       do_action( 'mu_rightnow_end' );
+       do_action( 'mu_activity_box_end' );
 }
 
-function wp_dashboard_quick_press() {
-       $drafts = false;
-       if ( 'post' === strtolower( $_SERVER['REQUEST_METHOD'] ) && isset( $_POST['action'] ) && 0 === strpos( $_POST['action'], 'post-quickpress' ) && (int) $_POST['post_ID'] ) {
-               $view = get_permalink( $_POST['post_ID'] );
-               $edit = clean_url( get_edit_post_link( $_POST['post_ID'] ) );
-               if ( 'post-quickpress-publish' == $_POST['action'] ) {
-                       if ( current_user_can('publish_posts') )
-                               printf( '<div class="message"><p>' . __( 'Post Published. <a href="%s">View post</a> | <a href="%s">Edit post</a>' ) . '</p></div>', clean_url( $view ), $edit );
-                       else
-                               printf( '<div class="message"><p>' . __( 'Post submitted. <a href="%s">Preview post</a> | <a href="%s">Edit post</a>' ) . '</p></div>', clean_url( add_query_arg( 'preview', 1, $view ) ), $edit );
+/**
+ * The Quick Draft widget display and creation of drafts.
+ *
+ * @since 3.8.0
+ *
+ * @param string $error_msg Optional. Error message. Default false.
+ */
+function wp_dashboard_quick_press( $error_msg = false ) {
+       global $post_ID;
+
+       /* Check if a new auto-draft (= no new post_ID) is needed or if the old can be used */
+       $last_post_id = (int) get_user_option( 'dashboard_quick_press_last_post_id' ); // Get the last post_ID
+       if ( $last_post_id ) {
+               $post = get_post( $last_post_id );
+               if ( empty( $post ) || $post->post_status != 'auto-draft' ) { // auto-draft doesn't exists anymore
+                       $post = get_default_post_to_edit( 'post', true );
+                       update_user_option( get_current_user_id(), 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
                } else {
-                       printf( '<div class="message"><p>' . __( 'Draft Saved. <a href="%s">Preview post</a> | <a href="%s">Edit post</a>' ) . '</p></div>', clean_url( add_query_arg( 'preview', 1, $view ) ), $edit );
-                       $drafts_query = new WP_Query( array(
-                               'post_type' => 'post',
-                               'what_to_show' => 'posts',
-                               'post_status' => 'draft',
-                               'author' => $GLOBALS['current_user']->ID,
-                               'posts_per_page' => 1,
-                               'orderby' => 'modified',
-                               'order' => 'DESC'
-                       ) );
-
-                       if ( $drafts_query->posts )
-                               $drafts =& $drafts_query->posts;
+                       $post->post_title = ''; // Remove the auto draft title
                }
-               printf('<p class="textright">' . __('You can also try %s, easy blogging from anywhere on the Web.') . '</p>', '<a href="tools.php">' . __('Press This') . '</a>' );
-               $_REQUEST = array(); // hack for get_default_post_to_edit()
+       } else {
+               $post = get_default_post_to_edit( 'post' , true);
+               $user_id = get_current_user_id();
+               // Don't create an option if this is a super admin who does not belong to this site.
+               if ( ! ( is_super_admin( $user_id ) && ! in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user_id ) ) ) ) )
+                       update_user_option( $user_id, 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
        }
 
-       $post = get_default_post_to_edit();
+       $post_ID = (int) $post->ID;
 ?>
 
-       <form name="post" action="<?php echo clean_url( admin_url( 'post.php' ) ); ?>" method="post" id="quick-press">
-               <h4 id="quick-post-title"><label for="title"><?php _e('Title') ?></label></h4>
-               <div class="input-text-wrap">
-                       <input type="text" name="post_title" id="title" tabindex="1" autocomplete="off" value="<?php echo attribute_escape( $post->post_title ); ?>" />
-               </div>
+       <form name="post" action="<?php echo esc_url( admin_url( 'post.php' ) ); ?>" method="post" id="quick-press" class="initial-form hide-if-no-js">
 
-               <?php if ( current_user_can( 'upload_files' ) ) : ?>
-               <div id="media-buttons" class="hide-if-no-js">
-                       <?php do_action( 'media_buttons' ); ?>
-               </div>
+               <?php if ( $error_msg ) : ?>
+               <div class="error"><?php echo $error_msg; ?></div>
                <?php endif; ?>
 
-               <h4 id="content-label"><label for="content"><?php _e('Content') ?></label></h4>
-               <div class="textarea-wrap">
-                       <textarea name="content" id="content" class="mceEditor" rows="3" cols="15" tabindex="2"><?php echo $post->post_content; ?></textarea>
+               <div class="input-text-wrap" id="title-wrap">
+                       <label class="screen-reader-text prompt" for="title" id="title-prompt-text"><?php echo apply_filters( 'enter_title_here', __( 'Title' ), $post ); ?></label>
+                       <input type="text" name="post_title" id="title" autocomplete="off" />
                </div>
 
-               <script type="text/javascript">edCanvas = document.getElementById('content');edInsertContent = null;</script>
-
-               <h4><label for="tags-input"><?php _e('Tags') ?></label></h4>
-               <div class="input-text-wrap">
-                       <input type="text" name="tags_input" id="tags-input" tabindex="3" value="<?php echo get_tags_to_edit( $post->ID ); ?>" />
+               <div class="textarea-wrap" id="description-wrap">
+                       <label class="screen-reader-text prompt" for="content" id="content-prompt-text"><?php _e( 'What&#8217;s on your mind?' ); ?></label>
+                       <textarea name="content" id="content" class="mceEditor" rows="3" cols="15"></textarea>
                </div>
 
                <p class="submit">
-                       <input type="hidden" name="action" id="quickpost-action" value="post-quickpress-save" />
-                       <input type="hidden" name="quickpress_post_ID" value="<?php echo (int) $post->ID; ?>" />
-                       <?php wp_nonce_field('add-post'); ?>
-                       <input type="submit" name="save" id="save-post" class="button" tabindex="4" value="<?php _e('Save Draft'); ?>" />
-                       <input type="reset" value="<?php _e( 'Cancel' ); ?>" class="cancel" />
-                       <?php if ( current_user_can('publish_posts') ) { ?>
-                       <input type="submit" name="publish" id="publish" accesskey="p" tabindex="5" class="button-primary" value="<?php _e('Publish'); ?>" />
-                       <?php } else { ?>
-                       <input type="submit" name="publish" id="publish" accesskey="p" tabindex="5" class="button-primary" value="<?php _e('Submit for Review'); ?>" />
-                       <?php } ?>
+                       <input type="hidden" name="action" id="quickpost-action" value="post-quickdraft-save" />
+                       <input type="hidden" name="post_ID" value="<?php echo $post_ID; ?>" />
+                       <input type="hidden" name="post_type" value="post" />
+                       <?php wp_nonce_field( 'add-post' ); ?>
+                       <?php submit_button( __( 'Save Draft' ), 'primary', 'save', false, array( 'id' => 'save-post' ) ); ?>
                        <br class="clear" />
                </p>
 
        </form>
-
-<?php
-       if ( $drafts )
-               wp_dashboard_recent_drafts( $drafts );
-}
-
-function wp_dashboard_recent_drafts( $drafts = false ) {
-       if ( !$drafts ) {
-               $drafts_query = new WP_Query( array(
-                       'post_type' => 'post',
-                       'what_to_show' => 'posts',
-                       'post_status' => 'draft',
-                       'author' => $GLOBALS['current_user']->ID,
-                       'posts_per_page' => 5,
-                       'orderby' => 'modified',
-                       'order' => 'DESC'
-               ) );
-               $drafts =& $drafts_query->posts;
-       }
-
-       if ( $drafts && is_array( $drafts ) ) {
-               $list = array();
-               foreach ( $drafts as $draft ) {
-                       $url = get_edit_post_link( $draft->ID );
-                       $title = _draft_or_post_title( $draft->ID );
-                       $item = "<h4><a href='$url' title='" . sprintf( __( 'Edit "%s"' ), attribute_escape( $title ) ) . "'>$title</a> <abbr title='" . get_the_time(__('Y/m/d g:i:s A'), $draft) . "'>" . get_the_time( get_option( 'date_format' ), $draft ) . '</abbr></h4>';
-                       if ( $the_content = preg_split( '#\s#', strip_tags( $draft->post_content ), 11, PREG_SPLIT_NO_EMPTY ) )
-                               $item .= '<p>' . join( ' ', array_slice( $the_content, 0, 10 ) ) . ( 10 < count( $the_content ) ? '&hellip;' : '' ) . '</p>';
-                       $list[] = $item;
-               }
-?>
-       <ul>
-               <li><?php echo join( "</li>\n<li>", $list ); ?></li>
-       </ul>
-       <p class="textright"><a href="edit.php?post_status=draft" class="button"><?php _e('View all'); ?></a></p>
-<?php
-       } else {
-               _e('There are no drafts at the moment');
-       }
+       <?php
+       wp_dashboard_recent_drafts();
 }
 
 /**
- * Display recent comments dashboard widget content.
+ * Show recent drafts of the user on the dashboard.
  *
- * @since unknown
+ * @since 2.7.0
  */
-function wp_dashboard_recent_comments() {
-       global $wpdb;
-
-       if ( current_user_can('edit_posts') )
-               $allowed_states = array('0', '1');
-       else
-               $allowed_states = array('1');
-
-       // Select all comment types and filter out spam later for better query performance.
-       $comments = array();
-       $start = 0;
-
-       while ( count( $comments ) < 5 && $possible = $wpdb->get_results( "SELECT * FROM $wpdb->comments ORDER BY comment_date_gmt DESC LIMIT $start, 50" ) ) {
-
-               foreach ( $possible as $comment ) {
-                       if ( count( $comments ) >= 5 )
-                               break;
-                       if ( in_array( $comment->comment_approved, $allowed_states ) )
-                               $comments[] = $comment;
-               }
-
-               $start = $start + 50;
-       }
-
-       if ( $comments ) :
-?>
-
-               <div id="the-comment-list" class="list:comment">
-<?php
-               foreach ( $comments as $comment )
-                       _wp_dashboard_recent_comments_row( $comment );
-?>
-
-               </div>
-
-<?php
-               if ( current_user_can('edit_posts') ) { ?>
-                       <p class="textright"><a href="edit-comments.php" class="button"><?php _e('View all'); ?></a></p>
-<?php  }
-
-               wp_comment_reply( -1, false, 'dashboard', false );
-
-       else :
-?>
-
-       <p><?php _e( 'No comments yet.' ); ?></p>
-
-<?php
-       endif; // $comments;
+function wp_dashboard_recent_drafts( $drafts = false ) {
+       if ( ! $drafts ) {
+               $query_args = array(
+                       'post_type'      => 'post',
+                       'post_status'    => 'draft',
+                       'author'         => get_current_user_id(),
+                       'posts_per_page' => 4,
+                       'orderby'        => 'modified',
+                       'order'          => 'DESC'
+               );
+               $drafts = get_posts( $query_args );
+               if ( ! $drafts ) {
+                       return;
+               }
+       }
+
+       echo '<div class="drafts">';
+       if ( count( $drafts ) > 3 ) {
+               echo '<p class="view-all"><a href="' . esc_url( admin_url( 'edit.php?post_status=draft' ) ) . '">' . _x( 'View all', 'drafts' ) . "</a></p>\n";
+       }
+       echo '<h4 class="hide-if-no-js">' . __( 'Drafts' ) . "</h4>\n<ul>";
+
+       $drafts = array_slice( $drafts, 0, 3 );
+       foreach ( $drafts as $draft ) {
+               $url = get_edit_post_link( $draft->ID );
+               $title = _draft_or_post_title( $draft->ID );
+               echo "<li>\n";
+               echo '<div class="draft-title"><a href="' . esc_url( $url ) . '" title="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $title ) ) . '">' . esc_html( $title ) . '</a>';
+               echo '<time datetime="' . get_the_time( 'c', $draft ) . '">' . get_the_time( get_option( 'date_format' ), $draft ) . '</time></div>';
+               if ( $the_content = wp_trim_words( $draft->post_content, 10 ) ) {
+                       echo '<p>' . $the_content . '</p>';
+               }
+               echo "</li>\n";
+       }
+       echo "</ul>\n</div>";
 }
 
 function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
        $GLOBALS['comment'] =& $comment;
 
        $comment_post_url = get_edit_post_link( $comment->comment_post_ID );
-       $comment_post_title = get_the_title( $comment->comment_post_ID );
+       $comment_post_title = strip_tags(get_the_title( $comment->comment_post_ID ));
        $comment_post_link = "<a href='$comment_post_url'>$comment_post_title</a>";
-       $comment_link = '<a class="comment-link" href="' . get_comment_link() . '">#</a>';
-
-       $delete_url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) );
-       $approve_url = clean_url( wp_nonce_url( "comment.php?action=approvecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "approve-comment_$comment->comment_ID" ) );
-       $unapprove_url = clean_url( wp_nonce_url( "comment.php?action=unapprovecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "unapprove-comment_$comment->comment_ID" ) );
-       $spam_url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&dt=spam&p=$comment->comment_post_ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) );
-
-       $actions = array();
+       $comment_link = '<a class="comment-link" href="' . esc_url(get_comment_link()) . '">#</a>';
 
        $actions_string = '';
-       if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
-               $actions['approve'] = "<a href='$approve_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved vim-a' title='" . __( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
-               $actions['unapprove'] = "<a href='$unapprove_url' class='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved vim-u' title='" . __( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
-               $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>". __('Edit') . '</a>';
-               //$actions['quickedit'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\',\'edit\');return false;" class="vim-q" title="'.__('Quick Edit').'" href="#">' . __('Quick&nbsp;Edit') . '</a>';
-               $actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\');return false;" class="vim-r hide-if-no-js" title="'.__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
-               $actions['spam'] = "<a href='$spam_url' class='delete:the-comment-list:comment-$comment->comment_ID::spam=1 vim-s vim-destructive' title='" . __( 'Mark this comment as spam' ) . "'>" . _c( 'Spam|verb' ) . '</a>';
-               $actions['delete'] = "<a href='$delete_url' class='delete:the-comment-list:comment-$comment->comment_ID delete vim-d vim-destructive'>" . __('Delete') . '</a>';
+       if ( current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+               // preorder it: Approve | Reply | Edit | Spam | Trash
+               $actions = array(
+                       'approve' => '', 'unapprove' => '',
+                       'reply' => '',
+                       'edit' => '',
+                       'spam' => '',
+                       'trash' => '', 'delete' => ''
+               );
+
+               $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
+               $approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) );
+
+               $approve_url = esc_url( "comment.php?action=approvecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$approve_nonce" );
+               $unapprove_url = esc_url( "comment.php?action=unapprovecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$approve_nonce" );
+               $spam_url = esc_url( "comment.php?action=spamcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
+               $trash_url = esc_url( "comment.php?action=trashcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
+               $delete_url = esc_url( "comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
+
+               $actions['approve'] = "<a href='$approve_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved' class='vim-a' title='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
+               $actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved' class='vim-u' title='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
+               $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . esc_attr__('Edit comment') . "'>". __('Edit') . '</a>';
+               $actions['reply'] = '<a onclick="commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\');return false;" class="vim-r hide-if-no-js" title="'.esc_attr__('Reply to this comment').'" href="#">' . __('Reply') . '</a>';
+               $actions['spam'] = "<a href='$spam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::spam=1' class='vim-s vim-destructive' title='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
+               if ( !EMPTY_TRASH_DAYS )
+                       $actions['delete'] = "<a href='$delete_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive'>" . __('Delete Permanently') . '</a>';
+               else
+                       $actions['trash'] = "<a href='$trash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' title='" . esc_attr__( 'Move this comment to the trash' ) . "'>" . _x('Trash', 'verb') . '</a>';
 
-               $actions = apply_filters( 'comment_row_actions', $actions, $comment );
+               $actions = apply_filters( 'comment_row_actions', array_filter($actions), $comment );
 
                $i = 0;
                foreach ( $actions as $action => $link ) {
@@ -521,8 +478,13 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
                <div id="comment-<?php echo $comment->comment_ID; ?>" <?php comment_class( array( 'comment-item', wp_get_comment_status($comment->comment_ID) ) ); ?>>
                        <?php if ( !$comment->comment_type || 'comment' == $comment->comment_type ) : ?>
 
-                       <?php echo get_avatar( $comment, 50 ); ?>
-                       <h4 class="comment-meta"><?php printf( __( 'From %1$s on %2$s%3$s' ), '<cite class="comment-author">' . get_comment_author_link() . '</cite>', $comment_post_link." ".$comment_link, ' <span class="approve">' . __( '[Pending]' ) . '</span>' ); ?></h4>
+                       <?php echo get_avatar( $comment, 50, 'mystery' ); ?>
+
+                       <div class="dashboard-comment-wrap">
+                       <h4 class="comment-meta">
+                               <?php printf( /* translators: 1: comment author, 2: post link, 3: notification if the comment is pending */__( 'From %1$s on %2$s%3$s' ),
+                                       '<cite class="comment-author">' . get_comment_author_link() . '</cite>', $comment_post_link.' '.$comment_link, ' <span class="approve">' . __( '[Pending]' ) . '</span>' ); ?>
+                       </h4>
 
                        <?php
                        else :
@@ -536,265 +498,260 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
                                default :
                                        $type = ucwords( $comment->comment_type );
                                endswitch;
-                               $type = wp_specialchars( $type );
+                               $type = esc_html( $type );
                        ?>
-
-                       <h4 class="comment-meta"><?php printf( __( '%1$s on %2$s' ), "<strong>$type</strong>", $comment_post_link ); ?></h4>
+                       <div class="dashboard-comment-wrap">
+                       <?php /* translators: %1$s is type of comment, %2$s is link to the post */ ?>
+                       <h4 class="comment-meta"><?php printf( _x( '%1$s on %2$s', 'dashboard' ), "<strong>$type</strong>", $comment_post_link." ".$comment_link ); ?></h4>
                        <p class="comment-author"><?php comment_author_link(); ?></p>
 
                        <?php endif; // comment_type ?>
                        <blockquote><p><?php comment_excerpt(); ?></p></blockquote>
                        <p class="row-actions"><?php echo $actions_string; ?></p>
-
-                       <div id="inline-<?php echo $comment->comment_ID; ?>" class="hidden">
-                               <textarea class="comment" rows="3" cols="10"><?php echo $comment->comment_content; ?></textarea>
-                               <div class="author-email"><?php echo attribute_escape( $comment->comment_author_email ); ?></div>
-                               <div class="author"><?php echo attribute_escape( $comment->comment_author ); ?></div>
-                               <div class="author-url"><?php echo attribute_escape( $comment->comment_author_url ); ?></div>
-                               <div class="comment_status"><?php echo $comment->comment_approved; ?></div>
                        </div>
-
                </div>
 <?php
 }
 
-function wp_dashboard_incoming_links() {
-       wp_dashboard_cached_rss_widget( 'dashboard_incoming_links', 'wp_dashboard_incoming_links_output' );
-}
-
 /**
- * Display incoming links dashboard widget content.
+ * Callback function for Activity widget.
  *
- * @since unknown
+ * @since 3.8.0
  */
-function wp_dashboard_incoming_links_output() {
-       $widgets = get_option( 'dashboard_widget_options' );
-       @extract( @$widgets['dashboard_incoming_links'], EXTR_SKIP );
-       $rss = @fetch_rss( $url );
-       if ( isset($rss->items) && 0 < count($rss->items) )  {
-
-               echo "<ul>\n";
-
-               $rss->items = array_slice($rss->items, 0, $items);
-               foreach ( $rss->items as $item ) {
-                       $publisher = '';
-                       $site_link = '';
-                       $link = '';
-                       $content = '';
-                       $date = '';
-                       $link = clean_url( strip_tags( $item['link'] ) );
-
-                       if ( isset( $item['author_uri'] ) )
-                               $site_link = clean_url( strip_tags( $item['author_uri'] ) );
-
-                       if ( !$publisher = wp_specialchars( strip_tags( isset($item['dc']['publisher']) ? $item['dc']['publisher'] : $item['author_name'] ) ) )
-                               $publisher = __( 'Somebody' );
-                       if ( $site_link )
-                               $publisher = "<a href='$site_link'>$publisher</a>";
-                       else
-                               $publisher = "<strong>$publisher</strong>";
-
-                       if ( isset($item['description']) )
-                               $content = $item['description'];
-                       elseif ( isset($item['summary']) )
-                               $content = $item['summary'];
-                       elseif ( isset($item['atom_content']) )
-                               $content = $item['atom_content'];
-                       else
-                               $content = __( 'something' );
-                       $content = wp_html_excerpt($content, 50) . ' ...';
-                       if ( $link )
-                               $text = _c( '%1$s linked here <a href="%2$s">saying</a>, "%3$s"|feed_display' );
-                       else
-                               $text = _c( '%1$s linked here saying, "%3$s"|feed_display' );
-
-                       if ( $show_date ) {
-                               if ( $show_author || $show_summary )
-                                       $text .= _c( ' on %4$s|feed_display' );
-                               $date = wp_specialchars( strip_tags( isset($item['pubdate']) ? $item['pubdate'] : $item['published'] ) );
-                               $date = strtotime( $date );
-                               $date = gmdate( get_option( 'date_format' ), $date );
-                       }
+function wp_dashboard_site_activity() {
 
-                       echo "\t<li>" . sprintf( _c( "$text|feed_display" ), $publisher, $link, $content, $date ) . "</li>\n";
-               }
+       echo '<div id="activity-widget">';
 
-               echo "</ul>\n";
+       $future_posts = wp_dashboard_recent_posts( array(
+               'display' => 2,
+               'max'     => 5,
+               'status'  => 'future',
+               'order'   => 'ASC',
+               'title'   => __( 'Publishing Soon' ),
+               'id'      => 'future-posts',
+       ) );
+       $recent_posts = wp_dashboard_recent_posts( array(
+               'display' => 2,
+               'max'     => 5,
+               'status'  => 'publish',
+               'order'   => 'DESC',
+               'title'   => __( 'Recently Published' ),
+               'id'      => 'published-posts',
+       ) );
 
-       } else {
-               echo '<p>' . __('This dashboard widget queries <a href="http://blogsearch.google.com/">Google Blog Search</a> so that when another blog links to your site it will show up here. It has found no incoming links&hellip; yet. It&#8217;s okay &#8212; there is no rush.') . "</p>\n";
-       }
-}
+       $recent_comments = wp_dashboard_recent_comments();
 
-function wp_dashboard_incoming_links_control() {
-       wp_dashboard_rss_control( 'dashboard_incoming_links', array( 'title' => false, 'show_summary' => false, 'show_author' => false ) );
-}
-
-function wp_dashboard_primary() {
-       wp_dashboard_cached_rss_widget( 'dashboard_primary', 'wp_dashboard_rss_output' );
-}
+       if ( !$future_posts && !$recent_posts && !$recent_comments ) {
+               echo '<div class="no-activity">';
+               echo '<p class="smiley"></p>';
+               echo '<p>' . __( 'No activity yet!' ) . '</p>';
+               echo '</div>';
+       }
 
-function wp_dashboard_primary_control() {
-       wp_dashboard_rss_control( 'dashboard_primary' );
+       echo '</div>';
 }
 
 /**
- * {@internal Missing Short Description}}
+ * Generates Publishing Soon and Recently Published sections.
+ *
+ * @since 3.8.0
  *
- * @since unknown
+ * @param array $args {
+ *     An array of query and display arguments.
  *
- * @param int $widget_id
+ *     @type int    $display Number of posts to display.
+ *     @type int    $max     Maximum number of posts to query.
+ *     @type string $status  Post status.
+ *     @type string $order   Designates ascending ('ASC') or descending ('DESC') order.
+ *     @type string $title   Section title.
+ *     @type string $id      The container id.
+ * }
+ * @return bool False if no posts were found. True otherwise.
  */
-function wp_dashboard_rss_output( $widget_id ) {
-       $widgets = get_option( 'dashboard_widget_options' );
-       echo "<div class='rss-widget'>";
-       wp_widget_rss_output( $widgets[$widget_id] );
-       echo "</div>";
-}
+function wp_dashboard_recent_posts( $args ) {
+       $query_args = array(
+               'post_type'      => 'post',
+               'post_status'    => $args['status'],
+               'orderby'        => 'date',
+               'order'          => $args['order'],
+               'posts_per_page' => intval( $args['max'] ),
+               'no_found_rows'  => true,
+               'cache_results'  => false
+       );
+       $posts = new WP_Query( $query_args );
+
+       if ( $posts->have_posts() ) {
+
+               echo '<div id="' . $args['id'] . '" class="activity-block">';
+
+               if ( $posts->post_count > $args['display'] ) {
+                       echo '<small class="show-more hide-if-no-js"><a href="#">' . sprintf( __( 'See %s more&hellip;'), $posts->post_count - intval( $args['display'] ) ) . '</a></small>';
+               }
 
-function wp_dashboard_secondary() {
-       wp_dashboard_cached_rss_widget( 'dashboard_secondary', 'wp_dashboard_secondary_output' );
-}
+               echo '<h4>' . $args['title'] . '</h4>';
 
-function wp_dashboard_secondary_control() {
-       wp_dashboard_rss_control( 'dashboard_secondary' );
-}
+               echo '<ul>';
 
-/**
- * Display secondary dashboard RSS widget feed.
- *
- * @since unknown
- *
- * @return unknown
- */
-function wp_dashboard_secondary_output() {
-       $widgets = get_option( 'dashboard_widget_options' );
-       @extract( @$widgets['dashboard_secondary'], EXTR_SKIP );
-       $rss = @fetch_rss( $url );
+               $i = 0;
+               $today    = date( 'Y-m-d', current_time( 'timestamp' ) );
+               $tomorrow = date( 'Y-m-d', strtotime( '+1 day', current_time( 'timestamp' ) ) );
+
+               while ( $posts->have_posts() ) {
+                       $posts->the_post();
+
+                       $time = get_the_time( 'U' );
+                       if ( date( 'Y-m-d', $time ) == $today ) {
+                               $relative = __( 'Today' );
+                       } elseif ( date( 'Y-m-d', $time ) == $tomorrow ) {
+                               $relative = __( 'Tomorrow' );
+                       } else {
+                               /* translators: date and time format for recent posts on the dashboard, see http://php.net/date */
+                               $relative = date_i18n( __( 'M jS' ), $time );
+                       }
 
-       if ( !isset($rss->items) || 0 == count($rss->items) )
-               return false;
+                       $text = sprintf(
+                               /* translators: 1: relative date, 2: time, 4: post title */
+                               __( '<span>%1$s, %2$s</span> <a href="%3$s">%4$s</a>' ),
+                               $relative,
+                               get_the_time(),
+                               get_edit_post_link(),
+                               _draft_or_post_title()
+                       );
+
+                       $hidden = $i >= $args['display'] ? ' class="hidden"' : '';
+                       echo "<li{$hidden}>$text</li>";
+                       $i++;
+               }
 
-       $rss->items = array_slice($rss->items, 0, $items);
+               echo '</ul>';
+               echo '</div>';
 
-       if ( 'http://planet.wordpress.org/' == $rss->channel['link'] ) {
-               foreach ( array_keys($rss->items) as $i ) {
-                       list($site, $description) = explode( ':', wp_specialchars($rss->items[$i]['title']), 2 );
-                       $rss->items[$i]['dc']['creator'] = trim($site);
-                       $rss->items[$i]['title'] = trim($description);
-               }
+       } else {
+               return false;
        }
 
-       echo "<div class='rss-widget'>";
-       wp_widget_rss_output( $rss, $widgets['dashboard_secondary'] );
-       echo "</div>";
-}
+       wp_reset_postdata();
 
-function wp_dashboard_plugins() {
-       wp_dashboard_cached_rss_widget( 'dashboard_plugins', 'wp_dashboard_plugins_output', array(
-               'http://wordpress.org/extend/plugins/rss/browse/popular/',
-               'http://wordpress.org/extend/plugins/rss/browse/new/',
-               'http://wordpress.org/extend/plugins/rss/browse/updated/'
-       ) );
+       return true;
 }
 
 /**
- * Display plugins most popular, newest plugins, and recently updated widget text.
+ * Show Comments section.
+ *
+ * @since 3.8.0
  *
- * @since unknown
+ * @param int $total_items Optional. Number of comments to query. Default 5.
+ * @return bool False if no comments were found. True otherwise.
  */
-function wp_dashboard_plugins_output() {
-       $popular = @fetch_rss( 'http://wordpress.org/extend/plugins/rss/browse/popular/' );
-       $new     = @fetch_rss( 'http://wordpress.org/extend/plugins/rss/browse/new/' );
-       $updated = @fetch_rss( 'http://wordpress.org/extend/plugins/rss/browse/updated/' );
-
-       foreach ( array( 'popular' => __('Most Popular'), 'new' => __('Newest Plugins'), 'updated' => __('Recently Updated') ) as $feed => $label ) {
-               if ( !isset($$feed->items) || 0 == count($$feed->items) )
-                       continue;
+function wp_dashboard_recent_comments( $total_items = 5 ) {
+       global $wpdb;
 
-               $$feed->items = array_slice($$feed->items, 0, 5);
-               $item_key = array_rand($$feed->items);
+       // Select all comment types and filter out spam later for better query performance.
+       $comments = array();
+       $start = 0;
 
-               // Eliminate some common badly formed plugin descriptions
-               while ( ( null !== $item_key = array_rand($$feed->items) ) && false !== strpos( $$feed->items[$item_key]['description'], 'Plugin Name:' ) )
-                       unset($$feed->items[$item_key]);
+       $comments_query = array(
+               'number' => $total_items * 5,
+               'offset' => 0
+       );
+       if ( ! current_user_can( 'edit_posts' ) )
+               $comments_query['status'] = 'approve';
 
-               if ( !isset($$feed->items[$item_key]) )
-                       continue;
+       while ( count( $comments ) < $total_items && $possible = get_comments( $comments_query ) ) {
+               foreach ( $possible as $comment ) {
+                       if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) )
+                               continue;
+                       $comments[] = $comment;
+                       if ( count( $comments ) == $total_items )
+                               break 2;
+               }
+               $comments_query['offset'] += $comments_query['number'];
+               $comments_query['number'] = $total_items * 10;
+       }
 
-               $item = $$feed->items[$item_key];
 
-               // current bbPress feed item titles are: user on "topic title"
-               if ( preg_match( '/"(.*)"/s', $item['title'], $matches ) )
-                       $title = $matches[1];
-               else // but let's make it forward compatible if things change
-                       $title = $item['title'];
-               $title = wp_specialchars( $title );
 
-               $description = wp_specialchars( strip_tags(html_entity_decode($item['description'], ENT_QUOTES)) );
+       if ( $comments ) {
+               echo '<div id="latest-comments" class="activity-block">';
+               echo '<h4>' . __( 'Comments' ) . '</h4>';
 
-               list($link, $frag) = explode( '#', $item['link'] );
+               echo '<div id="the-comment-list" data-wp-lists="list:comment">';
+               foreach ( $comments as $comment )
+                       _wp_dashboard_recent_comments_row( $comment );
+               echo '</div>';
 
-               $link = clean_url($link);
-               if( preg_match('|/([^/]+?)/?$|', $link, $matches) )
-                       $slug = $matches[1];
-               else
-                       $slug = '';
+               if ( current_user_can('edit_posts') )
+                       _get_list_table('WP_Comments_List_Table')->views();
 
-               $ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&plugin=' . $slug, 'install-plugin_' . $slug) .
-                                                       '&amp;TB_iframe=true&amp;width=600&amp;height=800';
+               wp_comment_reply( -1, false, 'dashboard', false );
+               wp_comment_trashnotice();
 
-               echo "<h4>$label</h4>\n";
-               echo "<h5><a href='$link'>$title</a></h5>&nbsp;<span>(<a href='$ilink' class='thickbox' title='$title'>" . __( 'Install' ) . "</a>)</span>\n";
-               echo "<p>$description</p>\n";
+               echo '</div>';
+       } else {
+               return false;
        }
+       return true;
+}
+
+/**
+ * Display generic dashboard RSS widget feed.
+ *
+ * @since 2.5.0
+ *
+ * @param string $widget_id
+ */
+function wp_dashboard_rss_output( $widget_id ) {
+       $widgets = get_option( 'dashboard_widget_options' );
+       echo '<div class="rss-widget">';
+       wp_widget_rss_output( $widgets[ $widget_id ] );
+       echo "</div>";
 }
 
 /**
  * Checks to see if all of the feed url in $check_urls are cached.
  *
  * If $check_urls is empty, look for the rss feed url found in the dashboard
- * widget optios of $widget_id. If cached, call $callback, a function that
+ * widget options of $widget_id. If cached, call $callback, a function that
  * echoes out output for this widget. If not cache, echo a "Loading..." stub
  * which is later replaced by AJAX call (see top of /wp-admin/index.php)
  *
- * @since unknown
+ * @since 2.5.0
  *
- * @param int $widget_id
+ * @param string $widget_id
  * @param callback $callback
  * @param array $check_urls RSS feeds
  * @return bool False on failure. True on success.
  */
 function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = array() ) {
-       $loading = '<p class="widget-loading">' . __( 'Loading&#8230;' ) . '</p>';
+       $loading = '<p class="widget-loading hide-if-no-js">' . __( 'Loading&#8230;' ) . '</p><p class="hide-if-js">' . __( 'This widget requires JavaScript.' ) . '</p>';
+       $doing_ajax = ( defined('DOING_AJAX') && DOING_AJAX );
 
        if ( empty($check_urls) ) {
                $widgets = get_option( 'dashboard_widget_options' );
-               if ( empty($widgets[$widget_id]['url']) ) {
+               if ( empty($widgets[$widget_id]['url']) && ! $doing_ajax ) {
                        echo $loading;
                        return false;
                }
                $check_urls = array( $widgets[$widget_id]['url'] );
        }
 
+       $cache_key = 'dash_' . md5( $widget_id );
+       if ( false !== ( $output = get_transient( $cache_key ) ) ) {
+               echo $output;
+               return true;
+       }
 
-       require_once( ABSPATH . WPINC . '/rss.php' );
-       init(); // initialize rss constants
-
-       $cache = new RSSCache( MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE );
-
-       foreach ( $check_urls as $check_url ) {
-               $status = $cache->check_cache( $check_url );
-               if ( 'HIT' !== $status ) {
-                       echo $loading;
-                       return false;
-               }
+       if ( ! $doing_ajax ) {
+               echo $loading;
+               return false;
        }
 
        if ( $callback && is_callable( $callback ) ) {
                $args = array_slice( func_get_args(), 2 );
                array_unshift( $args, $widget_id );
+               ob_start();
                call_user_func_array( $callback, $args );
+               set_transient( $cache_key, ob_get_flush(), 12 * HOUR_IN_SECONDS ); // Default lifetime in cache of 12 hours (same as the feeds)
        }
 
        return true;
@@ -806,7 +763,7 @@ function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = ar
 /**
  * Calls widget control callback.
  *
- * @since unknown
+ * @since 2.5.0
  *
  * @param int $widget_control_id Registered Widget ID.
  */
@@ -824,10 +781,10 @@ function wp_dashboard_trigger_widget_control( $widget_control_id = false ) {
  * Sets up $args to be used as input to wp_widget_rss_form(). Handles POST data
  * from RSS-type widgets.
  *
- * @since unknown
+ * @since 2.5.0
  *
- * @param string widget_id
- * @param array form_inputs
+ * @param string $widget_id
+ * @param array $form_inputs
  */
 function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) {
        if ( !$widget_options = get_option( 'dashboard_widget_options' ) )
@@ -840,23 +797,372 @@ function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) {
        $widget_options[$widget_id]['number'] = $number;
 
        if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget-rss'][$number]) ) {
-               $_POST['widget-rss'][$number] = stripslashes_deep( $_POST['widget-rss'][$number] );
+               $_POST['widget-rss'][$number] = wp_unslash( $_POST['widget-rss'][$number] );
                $widget_options[$widget_id] = wp_widget_rss_process( $_POST['widget-rss'][$number] );
-               // title is optional.  If black, fill it if possible
+               $widget_options[$widget_id]['number'] = $number;
+               // title is optional. If black, fill it if possible
                if ( !$widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title']) ) {
-                       require_once(ABSPATH . WPINC . '/rss.php');
-                       $rss = fetch_rss($widget_options[$widget_id]['url']);
-                       $widget_options[$widget_id]['title'] = htmlentities(strip_tags($rss->channel['title']));
+                       $rss = fetch_feed($widget_options[$widget_id]['url']);
+                       if ( is_wp_error($rss) ) {
+                               $widget_options[$widget_id]['title'] = htmlentities(__('Unknown Feed'));
+                       } else {
+                               $widget_options[$widget_id]['title'] = htmlentities(strip_tags($rss->get_title()));
+                               $rss->__destruct();
+                               unset($rss);
+                       }
                }
                update_option( 'dashboard_widget_options', $widget_options );
+               $cache_key = 'dash_' . md5( $widget_id );
+               delete_transient( $cache_key );
        }
 
        wp_widget_rss_form( $widget_options[$widget_id], $form_inputs );
 }
 
+/**
+ * WordPress News dashboard widget.
+ *
+ * @since 2.7.0
+ */
+function wp_dashboard_primary() {
+       $feeds = array(
+               'news'   => array(
+                       'link'         => apply_filters( 'dashboard_primary_link', __( 'http://wordpress.org/news/' ) ),
+                       'url'          => apply_filters( 'dashboard_primary_feed', __( 'http://wordpress.org/news/feed/' ) ),
+                       'title'        => apply_filters( 'dashboard_primary_title', __( 'WordPress Blog' ) ),
+                       'items'        => 1,
+                       'show_summary' => 1,
+                       'show_author'  => 0,
+                       'show_date'    => 1,
+               ),
+               'planet' => array(
+                       'link'         => apply_filters( 'dashboard_secondary_link', __( 'http://planet.wordpress.org/' ) ),
+                       'url'          => apply_filters( 'dashboard_secondary_feed', __( 'http://planet.wordpress.org/feed/' ) ),
+                       'title'        => apply_filters( 'dashboard_secondary_title', __( 'Other WordPress News' ) ),
+                       'items'        => 3,
+                       'show_summary' => 0,
+                       'show_author'  => 0,
+                       'show_date'    => 0,
+               )
+       );
+
+       if ( ( ! is_multisite() && is_blog_admin() && current_user_can( 'install_plugins' ) ) || ( is_network_admin() && current_user_can( 'manage_network_plugins' ) && current_user_can( 'install_plugins' ) ) ) {
+               $feeds['plugins'] = array(
+                       'link'         => '',
+                       'url'          => array(
+                               'popular' => 'http://wordpress.org/plugins/rss/browse/popular/',
+                       ),
+                       'title'        => '',
+                       'items'        => 1,
+                       'show_summary' => 0,
+                       'show_author'  => 0,
+                       'show_date'    => 0,
+               );
+       }
+
+       wp_dashboard_cached_rss_widget( 'dashboard_primary', 'wp_dashboard_primary_output', $feeds );
+}
+
+/**
+ * Display the WordPress news feeds.
+ *
+ * @since 3.8.0
+ *
+ * @param string $widget_id Widget ID.
+ * @param array  $feeds     Array of RSS feeds.
+ */
+function wp_dashboard_primary_output( $widget_id, $feeds ) {
+       foreach( $feeds as $type => $args ) {
+               $args['type'] = $type;
+               echo '<div class="rss-widget">';
+               if ( $type === 'plugins' ) {
+                       wp_dashboard_plugins_output( $args['url'], $args );
+               } else {
+                       wp_widget_rss_output( $args['url'], $args );
+               }
+               echo "</div>";
+       }
+}
+
+/**
+ * Display plugins text for the WordPress news widget.
+ *
+ * @since 2.5.0
+ */
+function wp_dashboard_plugins_output( $rss, $args = array() ) {
+       // Plugin feeds plus link to install them
+       $popular = fetch_feed( $args['url']['popular'] );
+
+       if ( false === $plugin_slugs = get_transient( 'plugin_slugs' ) ) {
+               $plugin_slugs = array_keys( get_plugins() );
+               set_transient( 'plugin_slugs', $plugin_slugs, DAY_IN_SECONDS );
+       }
+
+       echo '<ul>';
+
+       foreach ( array(
+               'popular' => __( 'Popular Plugin' )
+       ) as $feed => $label ) {
+               if ( is_wp_error($$feed) || !$$feed->get_item_quantity() )
+                       continue;
+
+               $items = $$feed->get_items(0, 5);
+
+               // Pick a random, non-installed plugin
+               while ( true ) {
+                       // Abort this foreach loop iteration if there's no plugins left of this type
+                       if ( 0 == count($items) )
+                               continue 2;
+
+                       $item_key = array_rand($items);
+                       $item = $items[$item_key];
+
+                       list($link, $frag) = explode( '#', $item->get_link() );
+
+                       $link = esc_url($link);
+                       if ( preg_match( '|/([^/]+?)/?$|', $link, $matches ) )
+                               $slug = $matches[1];
+                       else {
+                               unset( $items[$item_key] );
+                               continue;
+                       }
+
+                       // Is this random plugin's slug already installed? If so, try again.
+                       reset( $plugin_slugs );
+                       foreach ( $plugin_slugs as $plugin_slug ) {
+                               if ( $slug == substr( $plugin_slug, 0, strlen( $slug ) ) ) {
+                                       unset( $items[$item_key] );
+                                       continue 2;
+                               }
+                       }
+
+                       // If we get to this point, then the random plugin isn't installed and we can stop the while().
+                       break;
+               }
+
+               // Eliminate some common badly formed plugin descriptions
+               while ( ( null !== $item_key = array_rand($items) ) && false !== strpos( $items[$item_key]->get_description(), 'Plugin Name:' ) )
+                       unset($items[$item_key]);
+
+               if ( !isset($items[$item_key]) )
+                       continue;
+
+               $title = esc_html( $item->get_title() );
+
+               $description = esc_html( strip_tags( @html_entity_decode( $item->get_description(), ENT_QUOTES, get_option( 'blog_charset' ) ) ) );
+
+               $ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&plugin=' . $slug, 'install-plugin_' . $slug) . '&amp;TB_iframe=true&amp;width=600&amp;height=800';
+
+               echo "<li class='dashboard-news-plugin'><span>$label:</span> <a href='$link' class='dashboard-news-plugin-link'>$title</a></h5>&nbsp;<span>(<a href='$ilink' class='thickbox' title='$title'>" . __( 'Install' ) . "</a>)</span></li>";
+
+               $$feed->__destruct();
+               unset( $$feed );
+       }
+
+       echo '</ul>';
+}
+
+/**
+ * Display file upload quota on dashboard.
+ *
+ * Runs on the activity_box_end hook in wp_dashboard_right_now().
+ *
+ * @since 3.0.0
+ *
+ * @return bool True if not multisite, user can't upload files, or the space check option is disabled.
+*/
+function wp_dashboard_quota() {
+       if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_site_option( 'upload_space_check_disabled' ) )
+               return true;
+
+       $quota = get_space_allowed();
+       $used = get_space_used();
+
+       if ( $used > $quota )
+               $percentused = '100';
+       else
+               $percentused = ( $used / $quota ) * 100;
+       $used_class = ( $percentused >= 70 ) ? ' warning' : '';
+       $used = round( $used, 2 );
+       $percentused = number_format( $percentused );
+
+       ?>
+       <h4 class="mu-storage"><?php _e( 'Storage Space' ); ?></h4>
+       <div class="mu-storage">
+       <ul>
+               <li class="storage-count">
+                       <?php $text = sprintf(
+                               /* translators: number of megabytes */
+                               __( '%s MB Space Allowed' ),
+                               number_format_i18n( $quota )
+                       );
+                       printf(
+                               '<a href="%1$s" title="%2$s">%3$s</a>',
+                               esc_url( admin_url( 'upload.php' ) ),
+                               __( 'Manage Uploads' ),
+                               $text
+                       ); ?>
+               </li><li class="storage-count <?php echo $used_class; ?>">
+                       <?php $text = sprintf(
+                               /* translators: 1: number of megabytes, 2: percentage */
+                               __( '%1$s MB (%2$s%%) Space Used' ),
+                               number_format_i18n( $used, 2 ),
+                               $percentused
+                       );
+                       printf(
+                               '<a href="%1$s" title="%2$s" class="musublink">%3$s</a>',
+                               esc_url( admin_url( 'upload.php' ) ),
+                               __( 'Manage Uploads' ),
+                               $text
+                       ); ?>
+               </li>
+       </ul>
+       </div>
+       <?php
+}
+add_action( 'activity_box_end', 'wp_dashboard_quota' );
+
+// Display Browser Nag Meta Box
+function wp_dashboard_browser_nag() {
+       $notice = '';
+       $response = wp_check_browser_version();
+
+       if ( $response ) {
+               if ( $response['insecure'] ) {
+                       $msg = sprintf( __( "It looks like you're using an insecure version of <a href='%s'>%s</a>. Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser." ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ) );
+               } else {
+                       $msg = sprintf( __( "It looks like you're using an old version of <a href='%s'>%s</a>. For the best WordPress experience, please update your browser." ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ) );
+               }
+
+               $browser_nag_class = '';
+               if ( !empty( $response['img_src'] ) ) {
+                       $img_src = ( is_ssl() && ! empty( $response['img_src_ssl'] ) )? $response['img_src_ssl'] : $response['img_src'];
+
+                       $notice .= '<div class="alignright browser-icon"><a href="' . esc_attr($response['update_url']) . '"><img src="' . esc_attr( $img_src ) . '" alt="" /></a></div>';
+                       $browser_nag_class = ' has-browser-icon';
+               }
+               $notice .= "<p class='browser-update-nag{$browser_nag_class}'>{$msg}</p>";
+
+               $browsehappy = 'http://browsehappy.com/';
+               $locale = get_locale();
+               if ( 'en_US' !== $locale )
+                       $browsehappy = add_query_arg( 'locale', $locale, $browsehappy );
+
+               $notice .= '<p>' . sprintf( __( '<a href="%1$s" class="update-browser-link">Update %2$s</a> or learn how to <a href="%3$s" class="browse-happy-link">browse happy</a>' ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ), esc_url( $browsehappy ) ) . '</p>';
+               $notice .= '<p class="hide-if-no-js"><a href="" class="dismiss">' . __( 'Dismiss' ) . '</a></p>';
+               $notice .= '<div class="clear"></div>';
+       }
+
+       echo apply_filters( 'browse-happy-notice', $notice, $response );
+}
+
+function dashboard_browser_nag_class( $classes ) {
+       $response = wp_check_browser_version();
+
+       if ( $response && $response['insecure'] )
+               $classes[] = 'browser-insecure';
+
+       return $classes;
+}
+
+/**
+ * Check if the user needs a browser update
+ *
+ * @since 3.2.0
+ *
+ * @return array|bool False on failure, array of browser data on success.
+ */
+function wp_check_browser_version() {
+       if ( empty( $_SERVER['HTTP_USER_AGENT'] ) )
+               return false;
+
+       $key = md5( $_SERVER['HTTP_USER_AGENT'] );
+
+       if ( false === ($response = get_site_transient('browser_' . $key) ) ) {
+               global $wp_version;
+
+               $options = array(
+                       'body'                  => array( 'useragent' => $_SERVER['HTTP_USER_AGENT'] ),
+                       'user-agent'    => 'WordPress/' . $wp_version . '; ' . home_url()
+               );
+
+               $response = wp_remote_post( 'http://api.wordpress.org/core/browse-happy/1.1/', $options );
+
+               if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
+                       return false;
+
+               /**
+                * Response should be an array with:
+                *  'name' - string - A user friendly browser name
+                *  'version' - string - The most recent version of the browser
+                *  'current_version' - string - The version of the browser the user is using
+                *  'upgrade' - boolean - Whether the browser needs an upgrade
+                *  'insecure' - boolean - Whether the browser is deemed insecure
+                *  'upgrade_url' - string - The url to visit to upgrade
+                *  'img_src' - string - An image representing the browser
+                *  'img_src_ssl' - string - An image (over SSL) representing the browser
+                */
+               $response = json_decode( wp_remote_retrieve_body( $response ), true );
+
+               if ( ! is_array( $response ) )
+                       return false;
+
+               set_site_transient( 'browser_' . $key, $response, WEEK_IN_SECONDS );
+       }
+
+       return $response;
+}
+
 /**
  * Empty function usable by plugins to output empty dashboard widget (to be populated later by JS).
  */
 function wp_dashboard_empty() {}
 
-?>
+/**
+ * Displays a welcome panel to introduce users to WordPress.
+ *
+ * @since 3.3.0
+ */
+function wp_welcome_panel() {
+       ?>
+       <div class="welcome-panel-content">
+       <h3><?php _e( 'Welcome to WordPress!' ); ?></h3>
+       <p class="about-description"><?php _e( 'We&#8217;ve assembled some links to get you started:' ); ?></p>
+       <div class="welcome-panel-column-container">
+       <div class="welcome-panel-column">
+               <h4><?php _e( 'Get Started' ); ?></h4>
+               <a class="button button-primary button-hero load-customize hide-if-no-customize" href="<?php echo wp_customize_url(); ?>"><?php _e( 'Customize Your Site' ); ?></a>
+               <a class="button button-primary button-hero hide-if-customize" href="<?php echo admin_url( 'themes.php' ); ?>"><?php _e( 'Customize Your Site' ); ?></a>
+               <?php if ( current_user_can( 'install_themes' ) || ( current_user_can( 'switch_themes' ) && count( wp_get_themes( array( 'allowed' => true ) ) ) > 1 ) ) : ?>
+                       <p class="hide-if-no-customize"><?php printf( __( 'or, <a href="%s">change your theme completely</a>' ), admin_url( 'themes.php' ) ); ?></p>
+               <?php endif; ?>
+       </div>
+       <div class="welcome-panel-column">
+               <h4><?php _e( 'Next Steps' ); ?></h4>
+               <ul>
+               <?php if ( 'page' == get_option( 'show_on_front' ) && ! get_option( 'page_for_posts' ) ) : ?>
+                       <li><?php printf( '<a href="%s" class="welcome-icon welcome-edit-page">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
+                       <li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
+               <?php elseif ( 'page' == get_option( 'show_on_front' ) ) : ?>
+                       <li><?php printf( '<a href="%s" class="welcome-icon welcome-edit-page">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
+                       <li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
+                       <li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Add a blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
+               <?php else : ?>
+                       <li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Write your first blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
+                       <li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add an About page' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
+               <?php endif; ?>
+                       <li><?php printf( '<a href="%s" class="welcome-icon welcome-view-site">' . __( 'View your site' ) . '</a>', home_url( '/' ) ); ?></li>
+               </ul>
+       </div>
+       <div class="welcome-panel-column welcome-panel-last">
+               <h4><?php _e( 'More Actions' ); ?></h4>
+               <ul>
+                       <li><?php printf( '<div class="welcome-icon welcome-widgets-menus">' . __( 'Manage <a href="%1$s">widgets</a> or <a href="%2$s">menus</a>' ) . '</div>', admin_url( 'widgets.php' ), admin_url( 'nav-menus.php' ) ); ?></li>
+                       <li><?php printf( '<a href="%s" class="welcome-icon welcome-comments">' . __( 'Turn comments on or off' ) . '</a>', admin_url( 'options-discussion.php' ) ); ?></li>
+                       <li><?php printf( '<a href="%s" class="welcome-icon welcome-learn-more">' . __( 'Learn more about getting started' ) . '</a>', __( 'http://codex.wordpress.org/First_Steps_With_WordPress' ) ); ?></li>
+               </ul>
+       </div>
+       </div>
+       </div>
+       <?php
+}