WordPress 4.4.1-scripts

[autoinstalls/wordpress.git] / wp-admin / includes / dashboard.php

diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index 7179aa3480c7f51fd2711daa48c1b2537ab2c6a6..144fcc04fc77f768fa7f5aa5bcd5011933c425e5 100644 (file)
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -12,6 +12,10 @@
  * Handles POST data, sets up filters.
  *
  * @since 2.5.0
  * Handles POST data, sets up filters.
  *
  * @since 2.5.0

+ *
+ * @global array $wp_registered_widgets
+ * @global array $wp_registered_widget_controls
+ * @global array $wp_dashboard_control_callbacks

  */
 function wp_dashboard_setup() {
        global $wp_registered_widgets, $wp_registered_widget_controls, $wp_dashboard_control_callbacks;
  */
 function wp_dashboard_setup() {
        global $wp_registered_widgets, $wp_registered_widget_controls, $wp_dashboard_control_callbacks;


@@ -43,7 +47,7 @@ function wp_dashboard_setup() {
        }
 
        // QuickPress Widget
        }
 
        // QuickPress Widget

-       if ( is_blog_admin() && current_user_can( 'edit_posts' ) ) {
+       if ( is_blog_admin() && current_user_can( get_post_type_object( 'post' )->cap->create_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' );
        }
                $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' );
        }


@@ -125,6 +129,16 @@ function wp_dashboard_setup() {
        do_action( 'do_meta_boxes', $screen->id, 'side', '' );
 }
 
        do_action( 'do_meta_boxes', $screen->id, 'side', '' );
 }
 

+/**
+ *
+ * @global array   $wp_dashboard_control_callbacks
+ *
+ * @param string   $widget_id
+ * @param string   $widget_name
+ * @param callable $callback
+ * @param callable $control_callback
+ * @param array    $callback_args
+ */

 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;
 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;


@@ -154,6 +168,11 @@ function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_
        add_meta_box( $widget_id, $widget_name, $callback, $screen, $location, $priority, $callback_args );
 }
 
        add_meta_box( $widget_id, $widget_name, $callback, $screen, $location, $priority, $callback_args );
 }
 

+/**
+ *
+ * @param type $dashboard
+ * @param type $meta_box
+ */

 function _wp_dashboard_control_callback( $dashboard, $meta_box ) {
        echo '<form method="post" class="dashboard-widget-control-form">';
        wp_dashboard_trigger_widget_control( $meta_box['id'] );
 function _wp_dashboard_control_callback( $dashboard, $meta_box ) {
        echo '<form method="post" class="dashboard-widget-control-form">';
        wp_dashboard_trigger_widget_control( $meta_box['id'] );


@@ -240,13 +259,15 @@ function wp_dashboard_right_now() {
                ?>
                <li class="comment-count"><a href="edit-comments.php"><?php echo $text; ?></a></li>
                <?php
                ?>
                <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
-               }
+               /* 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<?php
+                       if ( ! $num_comm->moderated ) {
+                               echo ' hidden';
+                       }
+               ?>"><a href="edit-comments.php?comment_status=moderated"><?php echo $text; ?></a></li>
+               <?php

        }
 
        /**
        }
 
        /**


@@ -336,6 +357,9 @@ function wp_dashboard_right_now() {
        <?php endif;
 }
 
        <?php endif;
 }
 

+/**
+ * @since 3.1.0
+ */

 function wp_network_dashboard_right_now() {
        $actions = array();
        if ( current_user_can('create_sites') )
 function wp_network_dashboard_right_now() {
        $actions = array();
        if ( current_user_can('create_sites') )


@@ -381,7 +405,7 @@ function wp_network_dashboard_right_now() {
                <p>
                        <label class="screen-reader-text" for="search-users"><?php _e( 'Search Users' ); ?></label>
                        <input type="search" name="s" value="" size="30" autocomplete="off" id="search-users"/>
                <p>
                        <label class="screen-reader-text" for="search-users"><?php _e( 'Search Users' ); ?></label>
                        <input type="search" name="s" value="" size="30" autocomplete="off" id="search-users"/>

-                       <?php submit_button( __( 'Search Users' ), 'button', 'submit', false, array( 'id' => 'submit_users' ) ); ?>
+                       <?php submit_button( __( 'Search Users' ), 'button', false, false, array( 'id' => 'submit_users' ) ); ?>

                </p>
        </form>
 
                </p>
        </form>
 


@@ -389,7 +413,7 @@ function wp_network_dashboard_right_now() {
                <p>
                        <label class="screen-reader-text" for="search-sites"><?php _e( 'Search Sites' ); ?></label>
                        <input type="search" name="s" value="" size="30" autocomplete="off" id="search-sites"/>
                <p>
                        <label class="screen-reader-text" for="search-sites"><?php _e( 'Search Sites' ); ?></label>
                        <input type="search" name="s" value="" size="30" autocomplete="off" id="search-sites"/>

-                       <?php submit_button( __( 'Search Sites' ), 'button', 'submit', false, array( 'id' => 'submit_sites' ) ); ?>
+                       <?php submit_button( __( 'Search Sites' ), 'button', false, false, array( 'id' => 'submit_sites' ) ); ?>

                </p>
        </form>
 <?php
                </p>
        </form>
 <?php


@@ -413,11 +437,17 @@ function wp_network_dashboard_right_now() {
  *
  * @since 3.8.0
  *
  *
  * @since 3.8.0
  *

+ * @global int $post_ID
+ *

  * @param string $error_msg Optional. Error message. Default false.
  */
 function wp_dashboard_quick_press( $error_msg = false ) {
        global $post_ID;
 
  * @param string $error_msg Optional. Error message. Default false.
  */
 function wp_dashboard_quick_press( $error_msg = false ) {
        global $post_ID;
 

+       if ( ! current_user_can( 'edit_posts' ) ) {
+               return;
+       }
+

        /* 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 ) {
        /* 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 ) {


@@ -479,6 +509,8 @@ function wp_dashboard_quick_press( $error_msg = false ) {
  * Show recent drafts of the user on the dashboard.
  *
  * @since 2.7.0
  * Show recent drafts of the user on the dashboard.
  *
  * @since 2.7.0

+ *
+ * @param array $drafts

  */
 function wp_dashboard_recent_drafts( $drafts = false ) {
        if ( ! $drafts ) {
  */
 function wp_dashboard_recent_drafts( $drafts = false ) {
        if ( ! $drafts ) {


@@ -490,6 +522,16 @@ function wp_dashboard_recent_drafts( $drafts = false ) {
                        'orderby'        => 'modified',
                        'order'          => 'DESC'
                );
                        'orderby'        => 'modified',
                        'order'          => 'DESC'
                );

+
+               /**
+                * Filter the post query arguments for the 'Recent Drafts' dashboard widget.
+                *
+                * @since 4.4.0
+                *
+                * @param array $query_args The query arguments for the 'Recent Drafts' dashboard widget.
+                */
+               $query_args = apply_filters( 'dashboard_recent_drafts_query_args', $query_args );
+

                $drafts = get_posts( $query_args );
                if ( ! $drafts ) {
                        return;
                $drafts = get_posts( $query_args );
                if ( ! $drafts ) {
                        return;


@@ -498,9 +540,9 @@ function wp_dashboard_recent_drafts( $drafts = false ) {
 
        echo '<div class="drafts">';
        if ( count( $drafts ) > 3 ) {
 
        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 '<p class="view-all"><a href="' . esc_url( admin_url( 'edit.php?post_status=draft' ) ) . '" aria-label="' . __( 'View all drafts' ) . '">' . _x( 'View all', 'drafts' ) . "</a></p>\n";

        }
        }

-       echo '<h4 class="hide-if-no-js">' . __( 'Drafts' ) . "</h4>\n<ul>";
+       echo '<h2 class="hide-if-no-js">' . __( 'Drafts' ) . "</h2>\n<ul>";

 
        $drafts = array_slice( $drafts, 0, 3 );
        foreach ( $drafts as $draft ) {
 
        $drafts = array_slice( $drafts, 0, 3 );
        foreach ( $drafts as $draft ) {


@@ -517,20 +559,23 @@ function wp_dashboard_recent_drafts( $drafts = false ) {
        echo "</ul>\n</div>";
 }
 
        echo "</ul>\n</div>";
 }
 

+/**
+ * @global WP_Comment $comment
+ *
+ * @param WP_Comment $comment
+ * @param bool       $show_date
+ */

 function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
 function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {

-       $GLOBALS['comment'] =& $comment;
+       $GLOBALS['comment'] = clone $comment;

 
 

-       $comment_post_title = _draft_or_post_title( $comment->comment_post_ID );
-
-       if ( current_user_can( 'edit_post', $comment->comment_post_ID ) ) {
+       if ( $comment->comment_post_ID > 0 && current_user_can( 'edit_post', $comment->comment_post_ID ) ) {
+               $comment_post_title = _draft_or_post_title( $comment->comment_post_ID );

                $comment_post_url = get_edit_post_link( $comment->comment_post_ID );
                $comment_post_link = "<a href='$comment_post_url'>$comment_post_title</a>";
        } else {
                $comment_post_url = get_edit_post_link( $comment->comment_post_ID );
                $comment_post_link = "<a href='$comment_post_url'>$comment_post_title</a>";
        } else {

-               $comment_post_link = $comment_post_title;
+               $comment_post_link = '';

        }
 
        }
 

-       $comment_link = '<a class="comment-link" href="' . esc_url(get_comment_link()) . '">#</a>';
-

        $actions_string = '';
        if ( current_user_can( 'edit_comment', $comment->comment_ID ) ) {
                // Pre-order it: Approve | Reply | Edit | Spam | Trash.
        $actions_string = '';
        if ( current_user_can( 'edit_comment', $comment->comment_ID ) ) {
                // Pre-order it: Approve | Reply | Edit | Spam | Trash.


@@ -539,7 +584,8 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
                        'reply' => '',
                        'edit' => '',
                        'spam' => '',
                        'reply' => '',
                        'edit' => '',
                        'spam' => '',

-                       'trash' => '', 'delete' => ''
+                       'trash' => '', 'delete' => '',
+                       'view' => '',

                );
 
                $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
                );
 
                $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );


@@ -556,10 +602,16 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
                $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . esc_attr__('Edit comment') . "'>". __('Edit') . '</a>';
                $actions['reply'] = '<a onclick="window.commentReply && 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>';
                $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . esc_attr__('Edit comment') . "'>". __('Edit') . '</a>';
                $actions['reply'] = '<a onclick="window.commentReply && 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 )
+
+               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>';
                        $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
+               } 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['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>';

+               }
+
+               if ( '1' === $comment->comment_approved ) {
+                       $actions['view'] = '<a class="comment-link" href="' . esc_url( get_comment_link( $comment ) ) . '">' . _x( 'View', 'verb' ) . '</a>';
+               }

 
                /**
                 * Filter the action links displayed for each comment in the 'Recent Comments'
 
                /**
                 * Filter the action links displayed for each comment in the 'Recent Comments'


@@ -567,10 +619,10 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
                 *
                 * @since 2.6.0
                 *
                 *
                 * @since 2.6.0
                 *

-                * @param array  $actions An array of comment actions. Default actions include:
-                *                        'Approve', 'Unapprove', 'Edit', 'Reply', 'Spam',
-                *                        'Delete', and 'Trash'.
-                * @param object $comment The comment object.
+                * @param array      $actions An array of comment actions. Default actions include:
+                *                            'Approve', 'Unapprove', 'Edit', 'Reply', 'Spam',
+                *                            'Delete', and 'Trash'.
+                * @param WP_Comment $comment The comment object.

                 */
                $actions = apply_filters( 'comment_row_actions', array_filter($actions), $comment );
 
                 */
                $actions = apply_filters( 'comment_row_actions', array_filter($actions), $comment );
 


@@ -589,17 +641,33 @@ 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) ) ); ?>>
+               <div id="comment-<?php echo $comment->comment_ID; ?>" <?php comment_class( array( 'comment-item', wp_get_comment_status( $comment ) ), $comment ); ?>>

 
                        <?php echo get_avatar( $comment, 50, 'mystery' ); ?>
 
                        <?php if ( !$comment->comment_type || 'comment' == $comment->comment_type ) : ?>
 
 
                        <?php echo get_avatar( $comment, 50, 'mystery' ); ?>
 
                        <?php if ( !$comment->comment_type || 'comment' == $comment->comment_type ) : ?>
 

-                       <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>
+                       <div class="dashboard-comment-wrap has-row-actions">
+                       <p class="comment-meta">
+                               <?php
+                               if ( $comment_post_link ) {
+                                       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( $comment ) . '</cite>',
+                                               $comment_post_link,
+                                               ' <span class="approve">' . __( '[Pending]' ) . '</span>'
+                                       );
+                               } else {
+                                       printf(
+                                               /* translators: 1: comment author, 2: notification if the comment is pending */
+                                               __( 'From %1$s %2$s' ),
+                                               '<cite class="comment-author">' . get_comment_author_link( $comment ) . '</cite>',
+                                               ' <span class="approve">' . __( '[Pending]' ) . '</span>'
+                                       );
+                               }
+                               ?>
+                       </p>

 
                        <?php
                        else :
 
                        <?php
                        else :


@@ -615,17 +683,18 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
                                }
                                $type = esc_html( $type );
                        ?>
                                }
                                $type = esc_html( $type );
                        ?>

-                       <div class="dashboard-comment-wrap">
+                       <div class="dashboard-comment-wrap has-row-actions">

                        <?php /* translators: %1$s is type of comment, %2$s is link to the post */ ?>
                        <?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>
+                       <p class="comment-meta"><?php printf( _x( '%1$s on %2$s', 'dashboard' ), "<strong>$type</strong>", $comment_post_link ); ?></p>
+                       <p class="comment-author"><?php comment_author_link( $comment ); ?></p>

 
                        <?php endif; // comment_type ?>
 
                        <?php endif; // comment_type ?>

-                       <blockquote><p><?php comment_excerpt(); ?></p></blockquote>
+                       <blockquote><p><?php comment_excerpt( $comment ); ?></p></blockquote>

                        <p class="row-actions"><?php echo $actions_string; ?></p>
                        </div>
                </div>
 <?php
                        <p class="row-actions"><?php echo $actions_string; ?></p>
                        </div>
                </div>
 <?php

+       $GLOBALS['comment'] = null;

 }
 
 /**
 }
 
 /**


@@ -706,7 +775,7 @@ function wp_dashboard_recent_posts( $args ) {
 
                echo '<div id="' . $args['id'] . '" class="activity-block">';
 
 
                echo '<div id="' . $args['id'] . '" class="activity-block">';
 

-               echo '<h4>' . $args['title'] . '</h4>';
+               echo '<h3>' . $args['title'] . '</h3>';

 
                echo '<ul>';
 
 
                echo '<ul>';
 


@@ -721,6 +790,9 @@ function wp_dashboard_recent_posts( $args ) {
                                $relative = __( 'Today' );
                        } elseif ( date( 'Y-m-d', $time ) == $tomorrow ) {
                                $relative = __( 'Tomorrow' );
                                $relative = __( 'Today' );
                        } elseif ( date( 'Y-m-d', $time ) == $tomorrow ) {
                                $relative = __( 'Tomorrow' );

+                       } elseif ( date( 'Y', $time ) !== date( 'Y', current_time( 'timestamp' ) ) ) {
+                               /* translators: date and time format for recent posts on the dashboard, from a different calendar year, see http://php.net/date */
+                               $relative = date_i18n( __( 'M jS Y' ), $time );

                        } else {
                                /* translators: date and time format for recent posts on the dashboard, see http://php.net/date */
                                $relative = date_i18n( __( 'M jS' ), $time );
                        } else {
                                /* translators: date and time format for recent posts on the dashboard, see http://php.net/date */
                                $relative = date_i18n( __( 'M jS' ), $time );


@@ -766,6 +838,9 @@ function wp_dashboard_recent_comments( $total_items = 5 ) {
                $comments_query['status'] = 'approve';
 
        while ( count( $comments ) < $total_items && $possible = get_comments( $comments_query ) ) {
                $comments_query['status'] = 'approve';
 
        while ( count( $comments ) < $total_items && $possible = get_comments( $comments_query ) ) {

+               if ( ! is_array( $possible ) ) {
+                       break;
+               }

                foreach ( $possible as $comment ) {
                        if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) )
                                continue;
                foreach ( $possible as $comment ) {
                        if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) )
                                continue;


@@ -779,7 +854,7 @@ function wp_dashboard_recent_comments( $total_items = 5 ) {
 
        if ( $comments ) {
                echo '<div id="latest-comments" class="activity-block">';
 
        if ( $comments ) {
                echo '<div id="latest-comments" class="activity-block">';

-               echo '<h4>' . __( 'Comments' ) . '</h4>';
+               echo '<h3>' . __( 'Comments' ) . '</h3>';

 
                echo '<div id="the-comment-list" data-wp-lists="list:comment">';
                foreach ( $comments as $comment )
 
                echo '<div id="the-comment-list" data-wp-lists="list:comment">';
                foreach ( $comments as $comment )


@@ -824,7 +899,7 @@ function wp_dashboard_rss_output( $widget_id ) {
  * @since 2.5.0
  *
  * @param string $widget_id
  * @since 2.5.0
  *
  * @param string $widget_id

- * @param callback $callback
+ * @param callable $callback

  * @param array $check_urls RSS feeds
  * @return bool False on failure. True on success.
  */
  * @param array $check_urls RSS feeds
  * @return bool False on failure. True on success.
  */


@@ -841,7 +916,8 @@ function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = ar
                $check_urls = array( $widgets[$widget_id]['url'] );
        }
 
                $check_urls = array( $widgets[$widget_id]['url'] );
        }
 

-       $cache_key = 'dash_' . md5( $widget_id );
+       $locale = get_locale();
+       $cache_key = 'dash_' . md5( $widget_id . '_' . $locale );

        if ( false !== ( $output = get_transient( $cache_key ) ) ) {
                echo $output;
                return true;
        if ( false !== ( $output = get_transient( $cache_key ) ) ) {
                echo $output;
                return true;


@@ -863,14 +939,17 @@ function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = ar
        return true;
 }
 
        return true;
 }
 

-/* Dashboard Widgets Controls */
+//
+// Dashboard Widgets Controls
+//

 
 

-// Calls widget_control callback

 /**
  * Calls widget control callback.
  *
  * @since 2.5.0
  *
 /**
  * Calls widget control callback.
  *
  * @since 2.5.0
  *

+ * @global array $wp_dashboard_control_callbacks
+ *

  * @param int $widget_control_id Registered Widget ID.
  */
 function wp_dashboard_trigger_widget_control( $widget_control_id = false ) {
  * @param int $widget_control_id Registered Widget ID.
  */
 function wp_dashboard_trigger_widget_control( $widget_control_id = false ) {


@@ -942,7 +1021,7 @@ function wp_dashboard_primary() {
                         *
                         * @param string $link The widget's primary link URL.
                         */
                         *
                         * @param string $link The widget's primary link URL.
                         */

-                       'link' => apply_filters( 'dashboard_primary_link', __( 'http://wordpress.org/news/' ) ),
+                       'link' => apply_filters( 'dashboard_primary_link', __( 'https://wordpress.org/news/' ) ),

 
                        /**
                         * Filter the primary feed URL for the 'WordPress News' dashboard widget.
 
                        /**
                         * Filter the primary feed URL for the 'WordPress News' dashboard widget.


@@ -994,7 +1073,15 @@ function wp_dashboard_primary() {
                         * @param string $title Title attribute for the widget's secondary link.
                         */
                        'title'        => apply_filters( 'dashboard_secondary_title', __( 'Other WordPress News' ) ),
                         * @param string $title Title attribute for the widget's secondary link.
                         */
                        'title'        => apply_filters( 'dashboard_secondary_title', __( 'Other WordPress News' ) ),

-                       'items'        => 3,
+
+                       /**
+                        * Filter the number of secondary link items for the 'WordPress News' dashboard widget.
+                        *
+                        * @since 4.4.0
+                        *
+                        * @param string $items How many items to show in the secondary feed.
+                        */
+                       'items'        => apply_filters( 'dashboard_secondary_items', 3 ),

                        'show_summary' => 0,
                        'show_author'  => 0,
                        'show_date'    => 0,
                        'show_summary' => 0,
                        'show_author'  => 0,
                        'show_date'    => 0,


@@ -1027,7 +1114,7 @@ function wp_dashboard_primary() {
  * @param array  $feeds     Array of RSS feeds.
  */
 function wp_dashboard_primary_output( $widget_id, $feeds ) {
  * @param array  $feeds     Array of RSS feeds.
  */
 function wp_dashboard_primary_output( $widget_id, $feeds ) {

-       foreach( $feeds as $type => $args ) {
+       foreach ( $feeds as $type => $args ) {

                $args['type'] = $type;
                echo '<div class="rss-widget">';
                if ( $type === 'plugins' ) {
                $args['type'] = $type;
                echo '<div class="rss-widget">';
                if ( $type === 'plugins' ) {


@@ -1137,7 +1224,7 @@ function wp_dashboard_quota() {
        $percentused = number_format( $percentused );
 
        ?>
        $percentused = number_format( $percentused );
 
        ?>

-       <h4 class="mu-storage"><?php _e( 'Storage Space' ); ?></h4>
+       <h3 class="mu-storage"><?php _e( 'Storage Space' ); ?></h3>

        <div class="mu-storage">
        <ul>
                <li class="storage-count">
        <div class="mu-storage">
        <ul>
                <li class="storage-count">


@@ -1170,7 +1257,6 @@ function wp_dashboard_quota() {
        </div>
        <?php
 }
        </div>
        <?php
 }

-add_action( 'activity_box_end', 'wp_dashboard_quota' );

 
 // Display Browser Nag Meta Box
 function wp_dashboard_browser_nag() {
 
 // Display Browser Nag Meta Box
 function wp_dashboard_browser_nag() {


@@ -1179,9 +1265,15 @@ function wp_dashboard_browser_nag() {
 
        if ( $response ) {
                if ( $response['insecure'] ) {
 
        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'] ) );
+                       /* translators: %s: browser name and link */
+                       $msg = sprintf( __( "It looks like you're using an insecure version of %s. Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser." ),
+                               sprintf( '<a href="%s">%s</a>', esc_url( $response['update_url'] ), esc_html( $response['name'] ) )
+                       );

                } else {
                } 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'] ) );
+                       /* translators: %s: browser name and link */
+                       $msg = sprintf( __( "It looks like you're using an old version of %s. For the best WordPress experience, please update your browser." ),
+                               sprintf( '<a href="%s">%s</a>', esc_url( $response['update_url'] ), esc_html( $response['name'] ) )
+                       );

                }
 
                $browser_nag_class = '';
                }
 
                $browser_nag_class = '';


@@ -1214,6 +1306,12 @@ function wp_dashboard_browser_nag() {
        echo apply_filters( 'browse-happy-notice', $notice, $response );
 }
 
        echo apply_filters( 'browse-happy-notice', $notice, $response );
 }
 

+/**
+ * @since 3.2.0
+ *
+ * @param array $classes
+ * @return array
+ */

 function dashboard_browser_nag_class( $classes ) {
        $response = wp_check_browser_version();
 
 function dashboard_browser_nag_class( $classes ) {
        $response = wp_check_browser_version();
 


@@ -1228,6 +1326,8 @@ function dashboard_browser_nag_class( $classes ) {
  *
  * @since 3.2.0
  *
  *
  * @since 3.2.0
  *

+ * @global string $wp_version
+ *

  * @return array|bool False on failure, array of browser data on success.
  */
 function wp_check_browser_version() {
  * @return array|bool False on failure, array of browser data on success.
  */
 function wp_check_browser_version() {


@@ -1252,8 +1352,8 @@ function wp_check_browser_version() {
                /**
                 * Response should be an array with:
                 *  'name' - string - A user friendly browser name
                /**
                 * 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
+                *  'version' - string - The version of the browser the user is using
+                *  'current_version' - string - The most recent version of the browser

                 *  '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
                 *  '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


@@ -1284,12 +1384,12 @@ function wp_dashboard_empty() {}
 function wp_welcome_panel() {
        ?>
        <div class="welcome-panel-content">
 function wp_welcome_panel() {
        ?>
        <div class="welcome-panel-content">

-       <h3><?php _e( 'Welcome to WordPress!' ); ?></h3>
+       <h2><?php _e( 'Welcome to WordPress!' ); ?></h2>

        <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">
                <?php if ( current_user_can( 'customize' ) ): ?>
        <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">
                <?php if ( current_user_can( 'customize' ) ): ?>

-                       <h4><?php _e( 'Get Started' ); ?></h4>
+                       <h3><?php _e( 'Get Started' ); ?></h3>

                        <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>
                <?php endif; ?>
                <a class="button button-primary button-hero hide-if-customize" href="<?php echo admin_url( 'themes.php' ); ?>"><?php _e( 'Customize Your Site' ); ?></a>
                        <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>
                <?php endif; ?>
                <a class="button button-primary button-hero hide-if-customize" href="<?php echo admin_url( 'themes.php' ); ?>"><?php _e( 'Customize Your Site' ); ?></a>


@@ -1298,7 +1398,7 @@ function wp_welcome_panel() {
                <?php endif; ?>
        </div>
        <div class="welcome-panel-column">
                <?php endif; ?>
        </div>
        <div class="welcome-panel-column">

-               <h4><?php _e( 'Next Steps' ); ?></h4>
+               <h3><?php _e( 'Next Steps' ); ?></h3>

                <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>
                <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>


@@ -1315,7 +1415,7 @@ function wp_welcome_panel() {
                </ul>
        </div>
        <div class="welcome-panel-column welcome-panel-last">
                </ul>
        </div>
        <div class="welcome-panel-column welcome-panel-last">

-               <h4><?php _e( 'More Actions' ); ?></h4>
+               <h3><?php _e( 'More Actions' ); ?></h3>

                <ul>
                <?php if ( current_theme_supports( 'widgets' ) || current_theme_supports( 'menus' ) ) : ?>
                        <li><div class="welcome-icon welcome-widgets-menus"><?php
                <ul>
                <?php if ( current_theme_supports( 'widgets' ) || current_theme_supports( 'menus' ) ) : ?>
                        <li><div class="welcome-icon welcome-widgets-menus"><?php