--- a/wp/wp-admin/includes/dashboard.php Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-admin/includes/dashboard.php Mon Oct 14 17:39:30 2019 +0200
@@ -12,6 +12,10 @@
* 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;
@@ -20,6 +24,18 @@
/* Register Widgets and Controls */
+ // Try Gutenberg
+
+ // If Gutenberg isn't activated, only show the panel to users who can install and activate it.
+ $plugins = get_plugins();
+ if ( is_plugin_inactive( 'gutenberg/gutenberg.php' ) && ! current_user_can( 'install_plugins' ) ) {
+ remove_action( 'try_gutenberg_panel', 'wp_try_gutenberg_panel' );
+ }
+ // If Gutenberg is activated, only show it to users who can use it.
+ if ( is_plugin_active( 'gutenberg/gutenberg.php' ) && ! current_user_can( 'edit_posts' ) ) {
+ remove_action( 'try_gutenberg_panel', 'wp_try_gutenberg_panel' );
+ }
+
$response = wp_check_browser_version();
if ( $response && $response['upgrade'] ) {
@@ -43,13 +59,13 @@
}
// 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' ) );
+ 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' ), __( 'Your Recent Drafts' ) );
wp_add_dashboard_widget( 'dashboard_quick_press', $quick_draft_title, 'wp_dashboard_quick_press' );
}
- // WordPress News
- wp_add_dashboard_widget( 'dashboard_primary', __( 'WordPress News' ), 'wp_dashboard_primary' );
+ // WordPress Events and News
+ wp_add_dashboard_widget( 'dashboard_primary', __( 'WordPress Events and News' ), 'wp_dashboard_events_news' );
if ( is_network_admin() ) {
@@ -61,7 +77,7 @@
do_action( 'wp_network_dashboard_setup' );
/**
- * Filter the list of widgets to load for the Network Admin dashboard.
+ * Filters the list of widgets to load for the Network Admin dashboard.
*
* @since 3.1.0
*
@@ -78,7 +94,7 @@
do_action( 'wp_user_dashboard_setup' );
/**
- * Filter the list of widgets to load for the User Admin dashboard.
+ * Filters the list of widgets to load for the User Admin dashboard.
*
* @since 3.1.0
*
@@ -95,7 +111,7 @@
do_action( 'wp_dashboard_setup' );
/**
- * Filter the list of widgets to load for the admin dashboard.
+ * Filters the list of widgets to load for the admin dashboard.
*
* @since 2.5.0
*
@@ -125,10 +141,33 @@
do_action( 'do_meta_boxes', $screen->id, 'side', '' );
}
+/**
+ * Adds a new dashboard widget.
+ *
+ * @since 2.7.0
+ *
+ * @global array $wp_dashboard_control_callbacks
+ *
+ * @param string $widget_id Widget ID (used in the 'id' attribute for the widget).
+ * @param string $widget_name Title of the widget.
+ * @param callable $callback Function that fills the widget with the desired content.
+ * The function should echo its output.
+ * @param callable $control_callback Optional. Function that outputs controls for the widget. Default null.
+ * @param array $callback_args Optional. Data that should be set as the $args property of the widget array
+ * (which is the second parameter passed to your callback). Default 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;
+ $private_callback_args = array( '__widget_basename' => $widget_name );
+
+ if ( is_null( $callback_args ) ) {
+ $callback_args = $private_callback_args;
+ } else if ( is_array( $callback_args ) ) {
+ $callback_args = array_merge( $callback_args, $private_callback_args );
+ }
+
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'] ) {
@@ -154,8 +193,17 @@
add_meta_box( $widget_id, $widget_name, $callback, $screen, $location, $priority, $callback_args );
}
+/**
+ * Outputs controls for the current dashboard widget.
+ *
+ * @access private
+ * @since 2.7.0
+ *
+ * @param mixed $dashboard
+ * @param array $meta_box
+ */
function _wp_dashboard_control_callback( $dashboard, $meta_box ) {
- echo '<form method="post" class="dashboard-widget-control-form">';
+ echo '<form method="post" class="dashboard-widget-control-form wp-clearfix">';
wp_dashboard_trigger_widget_control( $meta_box['id'] );
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']) . '" />';
@@ -235,22 +283,27 @@
}
// Comments
$num_comm = wp_count_comments();
- if ( $num_comm && $num_comm->approved ) {
+ if ( $num_comm && ( $num_comm->approved || $num_comm->moderated ) ) {
$text = sprintf( _n( '%s Comment', '%s Comments', $num_comm->approved ), number_format_i18n( $num_comm->approved ) );
?>
<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
- }
+ $moderated_comments_count_i18n = number_format_i18n( $num_comm->moderated );
+ /* translators: %s: number of comments in moderation */
+ $text = sprintf( _nx( '%s in moderation', '%s in moderation', $num_comm->moderated, 'comments' ), $moderated_comments_count_i18n );
+ /* translators: %s: number of comments in moderation */
+ $aria_label = sprintf( _nx( '%s comment in moderation', '%s comments in moderation', $num_comm->moderated, 'comments' ), $moderated_comments_count_i18n );
+ ?>
+ <li class="comment-mod-count<?php
+ if ( ! $num_comm->moderated ) {
+ echo ' hidden';
+ }
+ ?>"><a href="edit-comments.php?comment_status=moderated" aria-label="<?php esc_attr_e( $aria_label ); ?>"><?php echo $text; ?></a></li>
+ <?php
}
/**
- * Filter the array of extra elements to list in the 'At a Glance'
+ * Filters the array of extra elements to list in the 'At a Glance'
* dashboard widget.
*
* Prior to 3.8.0, the widget was named 'Right Now'. Each element
@@ -272,22 +325,23 @@
update_right_now_message();
// 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' ) ) {
+ if ( ! is_network_admin() && ! is_user_admin() && current_user_can( 'manage_options' ) && '0' == get_option( 'blog_public' ) ) {
/**
- * Filter the link title attribute for the 'Search Engines Discouraged'
+ * Filters the link title attribute for the 'Search Engines Discouraged'
* message displayed in the 'At a Glance' dashboard widget.
*
* Prior to 3.8.0, the widget was named 'Right Now'.
*
* @since 3.0.0
+ * @since 4.5.0 The default for `$title` was updated to an empty string.
*
* @param string $title Default attribute text.
*/
- $title = apply_filters( 'privacy_on_link_title', __( 'Your site is asking search engines not to index its content' ) );
+ $title = apply_filters( 'privacy_on_link_title', '' );
/**
- * Filter the link label for the 'Search Engines Discouraged' message
+ * Filters the link label for the 'Search Engines Discouraged' message
* displayed in the 'At a Glance' dashboard widget.
*
* Prior to 3.8.0, the widget was named 'Right Now'.
@@ -297,8 +351,9 @@
* @param string $content Default text.
*/
$content = apply_filters( 'privacy_on_link_text' , __( 'Search Engines Discouraged' ) );
+ $title_attr = '' === $title ? '' : " title='$title'";
- echo "<p><a href='options-reading.php' title='$title'>$content</a></p>";
+ echo "<p><a href='options-reading.php'$title_attr>$content</a></p>";
}
?>
</div>
@@ -336,6 +391,9 @@
<?php endif;
}
+/**
+ * @since 3.1.0
+ */
function wp_network_dashboard_right_now() {
$actions = array();
if ( current_user_can('create_sites') )
@@ -346,9 +404,12 @@
$c_users = get_user_count();
$c_blogs = get_blog_count();
+ /* translators: %s: number of users on the network */
$user_text = sprintf( _n( '%s user', '%s users', $c_users ), number_format_i18n( $c_users ) );
+ /* translators: %s: number of sites on the network */
$blog_text = sprintf( _n( '%s site', '%s sites', $c_blogs ), number_format_i18n( $c_blogs ) );
+ /* translators: 1: text indicating the number of sites on the network, 2: text indicating the number of users on the network */
$sentence = sprintf( __( 'You have %1$s and %2$s.' ), $blog_text, $user_text );
if ( $actions ) {
@@ -370,7 +431,7 @@
* Fires in the Network Admin 'Right Now' dashboard widget
* just before the user and site search form fields.
*
- * @since MU
+ * @since MU (3.0.0)
*
* @param null $unused
*/
@@ -381,7 +442,7 @@
<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' ), '', false, false, array( 'id' => 'submit_users' ) ); ?>
</p>
</form>
@@ -389,21 +450,21 @@
<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' ), '', false, false, array( 'id' => 'submit_sites' ) ); ?>
</p>
</form>
<?php
/**
* Fires at the end of the 'Right Now' widget in the Network Admin dashboard.
*
- * @since MU
+ * @since MU (3.0.0)
*/
do_action( 'mu_rightnow_end' );
/**
* Fires at the end of the 'Right Now' widget in the Network Admin dashboard.
*
- * @since MU
+ * @since MU (3.0.0)
*/
do_action( 'mu_activity_box_end' );
}
@@ -413,11 +474,17 @@
*
* @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;
+ 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 ) {
@@ -432,7 +499,7 @@
$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 ) ) ) ) )
+ if ( 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
}
@@ -479,6 +546,8 @@
* 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 ) {
@@ -490,6 +559,16 @@
'orderby' => 'modified',
'order' => 'DESC'
);
+
+ /**
+ * Filters 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;
@@ -498,17 +577,18 @@
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' ) ) . '">' . __( 'View all drafts' ) . "</a></p>\n";
}
- echo '<h4 class="hide-if-no-js">' . __( 'Drafts' ) . "</h4>\n<ul>";
+ echo '<h2 class="hide-if-no-js">' . __( 'Your Recent Drafts' ) . "</h2>\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 “%s”' ), $title ) ) . '">' . esc_html( $title ) . '</a>';
- echo '<time datetime="' . get_the_time( 'c', $draft ) . '">' . get_the_time( get_option( 'date_format' ), $draft ) . '</time></div>';
+ /* translators: %s: post title */
+ echo '<div class="draft-title"><a href="' . esc_url( $url ) . '" aria-label="' . esc_attr( sprintf( __( 'Edit “%s”' ), $title ) ) . '">' . esc_html( $title ) . '</a>';
+ echo '<time datetime="' . get_the_time( 'c', $draft ) . '">' . get_the_time( __( 'F j, Y' ), $draft ) . '</time></div>';
if ( $the_content = wp_trim_words( $draft->post_content, 10 ) ) {
echo '<p>' . $the_content . '</p>';
}
@@ -517,20 +597,29 @@
echo "</ul>\n</div>";
}
+/**
+ * Outputs a row for the Recent Comments widget.
+ *
+ * @access private
+ * @since 2.7.0
+ *
+ * @global WP_Comment $comment
+ *
+ * @param WP_Comment $comment The current comment.
+ * @param bool $show_date Optional. Whether to display the date.
+ */
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 ( $comment->comment_post_ID > 0 ) {
- if ( current_user_can( 'edit_post', $comment->comment_post_ID ) ) {
- $comment_post_url = get_edit_post_link( $comment->comment_post_ID );
+ $comment_post_title = _draft_or_post_title( $comment->comment_post_ID );
+ $comment_post_url = get_the_permalink( $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.
@@ -539,7 +628,8 @@
'reply' => '',
'edit' => '',
'spam' => '',
- 'trash' => '', 'delete' => ''
+ 'trash' => '', 'delete' => '',
+ 'view' => '',
);
$del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
@@ -551,26 +641,30 @@
$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&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 )
- $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['approve'] = "<a href='$approve_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved' class='vim-a' aria-label='" . 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' aria-label='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
+ $actions['edit'] = "<a href='comment.php?action=editcomment&c={$comment->comment_ID}' aria-label='" . esc_attr__( 'Edit this 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" aria-label="' . 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' aria-label='" . 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' aria-label='" . esc_attr__( 'Delete this comment permanently' ) . "'>" . __( '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' aria-label='" . esc_attr__( 'Move this comment to the Trash' ) . "'>" . _x( 'Trash', 'verb' ) . '</a>';
+ }
+
+ $actions['view'] = '<a class="comment-link" href="' . esc_url( get_comment_link( $comment ) ) . '" aria-label="' . esc_attr__( 'View this comment' ) . '">' . __( 'View' ) . '</a>';
/**
- * Filter the action links displayed for each comment in the 'Recent Comments'
+ * Filters the action links displayed for each comment in the 'Recent Comments'
* dashboard widget.
*
* @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 );
@@ -580,26 +674,46 @@
( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
// Reply and quickedit need a hide-if-no-js span
- if ( 'reply' == $action || 'quickedit' == $action )
+ if ( 'reply' == $action || 'quickedit' == $action ) {
$action .= ' hide-if-no-js';
+ }
+ if ( 'view' === $action && '1' !== $comment->comment_approved ) {
+ $action .= ' hidden';
+ }
$actions_string .= "<span class='$action'>$sep$link</span>";
}
}
-
?>
- <div id="comment-<?php echo $comment->comment_ID; ?>" <?php comment_class( array( 'comment-item', wp_get_comment_status($comment->comment_ID) ) ); ?>>
+ <li 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 ) : ?>
- <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
+ // Comments might not have a post they relate to, e.g. programmatically created ones.
+ 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 :
@@ -615,17 +729,39 @@
}
$type = esc_html( $type );
?>
- <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>
+ <div class="dashboard-comment-wrap has-row-actions">
+ <p class="comment-meta">
+ <?php
+ // Pingbacks, Trackbacks or custom comment types might not have a post they relate to, e.g. programmatically created ones.
+ if ( $comment_post_link ) {
+ printf(
+ /* translators: 1: type of comment, 2: post link, 3: notification if the comment is pending */
+ _x( '%1$s on %2$s %3$s', 'dashboard' ),
+ "<strong>$type</strong>",
+ $comment_post_link,
+ '<span class="approve">' . __( '[Pending]' ) . '</span>'
+ );
+ } else {
+ printf(
+ /* translators: 1: type of comment, 2: notification if the comment is pending */
+ _x( '%1$s %2$s', 'dashboard' ),
+ "<strong>$type</strong>",
+ '<span class="approve">' . __( '[Pending]' ) . '</span>'
+ );
+ }
+ ?>
+ </p>
+ <p class="comment-author"><?php comment_author_link( $comment ); ?></p>
<?php endif; // comment_type ?>
- <blockquote><p><?php comment_excerpt(); ?></p></blockquote>
+ <blockquote><p><?php comment_excerpt( $comment ); ?></p></blockquote>
+ <?php if ( $actions_string ) : ?>
<p class="row-actions"><?php echo $actions_string; ?></p>
+ <?php endif; ?>
</div>
- </div>
+ </li>
<?php
+ $GLOBALS['comment'] = null;
}
/**
@@ -656,7 +792,7 @@
if ( !$future_posts && !$recent_posts && !$recent_comments ) {
echo '<div class="no-activity">';
- echo '<p class="smiley"></p>';
+ echo '<p class="smiley" aria-hidden="true"></p>';
echo '<p>' . __( 'No activity yet!' ) . '</p>';
echo '</div>';
}
@@ -693,7 +829,7 @@
);
/**
- * Filter the query arguments used for the Recent Posts widget.
+ * Filters the query arguments used for the Recent Posts widget.
*
* @since 4.2.0
*
@@ -706,7 +842,7 @@
echo '<div id="' . $args['id'] . '" class="activity-block">';
- echo '<h4>' . $args['title'] . '</h4>';
+ echo '<h3>' . $args['title'] . '</h3>';
echo '<ul>';
@@ -721,17 +857,27 @@
$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 https://secure.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 */
+ /* translators: date and time format for recent posts on the dashboard, see https://secure.php.net/date */
$relative = date_i18n( __( 'M jS' ), $time );
}
// Use the post edit link for those who can edit, the permalink otherwise.
$recent_post_link = current_user_can( 'edit_post', get_the_ID() ) ? get_edit_post_link() : get_permalink();
- /* translators: 1: relative date, 2: time, 3: post edit link or permalink, 4: post title */
- $format = __( '<span>%1$s, %2$s</span> <a href="%3$s">%4$s</a>' );
- printf( "<li>$format</li>", $relative, get_the_time(), $recent_post_link, _draft_or_post_title() );
+ $draft_or_post_title = _draft_or_post_title();
+ printf(
+ '<li><span>%1$s</span> <a href="%2$s" aria-label="%3$s">%4$s</a></li>',
+ /* translators: 1: relative date, 2: time */
+ sprintf( _x( '%1$s, %2$s', 'dashboard' ), $relative, get_the_time() ),
+ $recent_post_link,
+ /* translators: %s: post title */
+ esc_attr( sprintf( __( 'Edit “%s”' ), $draft_or_post_title ) ),
+ $draft_or_post_title
+ );
}
echo '</ul>';
@@ -766,6 +912,9 @@
$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;
@@ -779,15 +928,17 @@
if ( $comments ) {
echo '<div id="latest-comments" class="activity-block">';
- echo '<h4>' . __( 'Comments' ) . '</h4>';
+ echo '<h3>' . __( 'Recent Comments' ) . '</h3>';
- echo '<div id="the-comment-list" data-wp-lists="list:comment">';
+ echo '<ul id="the-comment-list" data-wp-lists="list:comment">';
foreach ( $comments as $comment )
_wp_dashboard_recent_comments_row( $comment );
- echo '</div>';
+ echo '</ul>';
- if ( current_user_can('edit_posts') )
- _get_list_table('WP_Comments_List_Table')->views();
+ if ( current_user_can( 'edit_posts' ) ) {
+ echo '<h3 class="screen-reader-text">' . __( 'View more comments' ) . '</h3>';
+ _get_list_table( 'WP_Comments_List_Table' )->views();
+ }
wp_comment_reply( -1, false, 'dashboard', false );
wp_comment_trashnotice();
@@ -819,18 +970,18 @@
* If $check_urls is empty, look for the rss feed url found in the dashboard
* 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)
+ * which is later replaced by Ajax call (see top of /wp-admin/index.php)
*
* @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.
*/
function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = array() ) {
- $loading = '<p class="widget-loading hide-if-no-js">' . __( 'Loading…' ) . '</p><p class="hide-if-js">' . __( 'This widget requires JavaScript.' ) . '</p>';
- $doing_ajax = ( defined('DOING_AJAX') && DOING_AJAX );
+ $loading = '<p class="widget-loading hide-if-no-js">' . __( 'Loading…' ) . '</p><div class="hide-if-js notice notice-error inline"><p>' . __( 'This widget requires JavaScript.' ) . '</p></div>';
+ $doing_ajax = wp_doing_ajax();
if ( empty($check_urls) ) {
$widgets = get_option( 'dashboard_widget_options' );
@@ -841,7 +992,8 @@
$check_urls = array( $widgets[$widget_id]['url'] );
}
- $cache_key = 'dash_' . md5( $widget_id );
+ $locale = get_user_locale();
+ $cache_key = 'dash_v2_' . md5( $widget_id . '_' . $locale );
if ( false !== ( $output = get_transient( $cache_key ) ) ) {
echo $output;
return true;
@@ -863,14 +1015,17 @@
return true;
}
-/* Dashboard Widgets Controls */
+//
+// Dashboard Widgets Controls
+//
-// Calls widget_control callback
/**
* 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 ) {
@@ -919,33 +1074,233 @@
}
}
update_option( 'dashboard_widget_options', $widget_options );
- $cache_key = 'dash_' . md5( $widget_id );
+ $locale = get_user_locale();
+ $cache_key = 'dash_v2_' . md5( $widget_id . '_' . $locale );
delete_transient( $cache_key );
}
wp_widget_rss_form( $widget_options[$widget_id], $form_inputs );
}
+
+/**
+ * Renders the Events and News dashboard widget.
+ *
+ * @since 4.8.0
+ */
+function wp_dashboard_events_news() {
+ wp_print_community_events_markup();
+
+ ?>
+
+ <div class="wordpress-news hide-if-no-js">
+ <?php wp_dashboard_primary(); ?>
+ </div>
+
+ <p class="community-events-footer">
+ <?php
+ printf(
+ '<a href="%1$s" target="_blank">%2$s <span class="screen-reader-text">%3$s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a>',
+ 'https://make.wordpress.org/community/meetups-landing-page',
+ __( 'Meetups' ),
+ /* translators: accessibility text */
+ __( '(opens in a new window)' )
+ );
+ ?>
+
+ |
+
+ <?php
+ printf(
+ '<a href="%1$s" target="_blank">%2$s <span class="screen-reader-text">%3$s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a>',
+ 'https://central.wordcamp.org/schedule/',
+ __( 'WordCamps' ),
+ /* translators: accessibility text */
+ __( '(opens in a new window)' )
+ );
+ ?>
+
+ |
+
+ <?php
+ printf(
+ '<a href="%1$s" target="_blank">%2$s <span class="screen-reader-text">%3$s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a>',
+ /* translators: If a Rosetta site exists (e.g. https://es.wordpress.org/news/), then use that. Otherwise, leave untranslated. */
+ esc_url( _x( 'https://wordpress.org/news/', 'Events and News dashboard widget' ) ),
+ __( 'News' ),
+ /* translators: accessibility text */
+ __( '(opens in a new window)' )
+ );
+ ?>
+ </p>
+
+ <?php
+}
+
+/**
+ * Prints the markup for the Community Events section of the Events and News Dashboard widget.
+ *
+ * @since 4.8.0
+ */
+function wp_print_community_events_markup() {
+ ?>
+
+ <div class="community-events-errors notice notice-error inline hide-if-js">
+ <p class="hide-if-js">
+ <?php _e( 'This widget requires JavaScript.' ); ?>
+ </p>
+
+ <p class="community-events-error-occurred" aria-hidden="true">
+ <?php _e( 'An error occurred. Please try again.' ); ?>
+ </p>
+
+ <p class="community-events-could-not-locate" aria-hidden="true"></p>
+ </div>
+
+ <div class="community-events-loading hide-if-no-js">
+ <?php _e( 'Loading…' ); ?>
+ </div>
+
+ <?php
+ /*
+ * Hide the main element when the page first loads, because the content
+ * won't be ready until wp.communityEvents.renderEventsTemplate() has run.
+ */
+ ?>
+ <div id="community-events" class="community-events" aria-hidden="true">
+ <div class="activity-block">
+ <p>
+ <span id="community-events-location-message"></span>
+
+ <button class="button-link community-events-toggle-location" aria-label="<?php esc_attr_e( 'Edit city' ); ?>" aria-expanded="false">
+ <span class="dashicons dashicons-edit"></span>
+ </button>
+ </p>
+
+ <form class="community-events-form" aria-hidden="true" action="<?php echo esc_url( admin_url( 'admin-ajax.php' ) ); ?>" method="post">
+ <label for="community-events-location">
+ <?php _e( 'City:' ); ?>
+ </label>
+ <?php
+ /* translators: Replace with a city related to your locale.
+ * Test that it matches the expected location and has upcoming
+ * events before including it. If no cities related to your
+ * locale have events, then use a city related to your locale
+ * that would be recognizable to most users. Use only the city
+ * name itself, without any region or country. Use the endonym
+ * (native locale name) instead of the English name if possible.
+ */
+ ?>
+ <input id="community-events-location" class="regular-text" type="text" name="community-events-location" placeholder="<?php esc_attr_e( 'Cincinnati' ); ?>" />
+
+ <?php submit_button( __( 'Submit' ), 'secondary', 'community-events-submit', false ); ?>
+
+ <button class="community-events-cancel button-link" type="button" aria-expanded="false">
+ <?php _e( 'Cancel' ); ?>
+ </button>
+
+ <span class="spinner"></span>
+ </form>
+ </div>
+
+ <ul class="community-events-results activity-block last"></ul>
+ </div>
+
+ <?php
+}
+
+/**
+ * Renders the events templates for the Event and News widget.
+ *
+ * @since 4.8.0
+ */
+function wp_print_community_events_templates() {
+ ?>
+
+ <script id="tmpl-community-events-attend-event-near" type="text/template">
+ <?php printf(
+ /* translators: %s: the name of a city */
+ __( 'Attend an upcoming event near %s.' ),
+ '<strong>{{ data.location.description }}</strong>'
+ ); ?>
+ </script>
+
+ <script id="tmpl-community-events-could-not-locate" type="text/template">
+ <?php printf(
+ /* translators: %s is the name of the city we couldn't locate.
+ * Replace the examples with cities in your locale, but test
+ * that they match the expected location before including them.
+ * Use endonyms (native locale names) whenever possible.
+ */
+ __( 'We couldn’t locate %s. Please try another nearby city. For example: Kansas City; Springfield; Portland.' ),
+ '<em>{{data.unknownCity}}</em>'
+ ); ?>
+ </script>
+
+ <script id="tmpl-community-events-event-list" type="text/template">
+ <# _.each( data.events, function( event ) { #>
+ <li class="event event-{{ event.type }} wp-clearfix">
+ <div class="event-info">
+ <div class="dashicons event-icon" aria-hidden="true"></div>
+ <div class="event-info-inner">
+ <a class="event-title" href="{{ event.url }}">{{ event.title }}</a>
+ <span class="event-city">{{ event.location.location }}</span>
+ </div>
+ </div>
+
+ <div class="event-date-time">
+ <span class="event-date">{{ event.formatted_date }}</span>
+ <# if ( 'meetup' === event.type ) { #>
+ <span class="event-time">{{ event.formatted_time }}</span>
+ <# } #>
+ </div>
+ </li>
+ <# } ) #>
+ </script>
+
+ <script id="tmpl-community-events-no-upcoming-events" type="text/template">
+ <li class="event-none">
+ <# if ( data.location.description ) { #>
+ <?php printf(
+ /* translators: 1: the city the user searched for, 2: meetup organization documentation URL */
+ __( 'There aren’t any events scheduled near %1$s at the moment. Would you like to <a href="%2$s">organize one</a>?' ),
+ '{{ data.location.description }}',
+ __( 'https://make.wordpress.org/community/handbook/meetup-organizer/welcome/' )
+ ); ?>
+
+ <# } else { #>
+ <?php printf(
+ /* translators: %s: meetup organization documentation URL */
+ __( 'There aren’t any events scheduled near you at the moment. Would you like to <a href="%s">organize one</a>?' ),
+ __( 'https://make.wordpress.org/community/handbook/meetup-organizer/welcome/' )
+ ); ?>
+ <# } #>
+ </li>
+ </script>
+ <?php
+}
+
/**
* WordPress News dashboard widget.
*
* @since 2.7.0
+ * @since 4.8.0 Removed popular plugins feed.
*/
function wp_dashboard_primary() {
$feeds = array(
'news' => array(
/**
- * Filter the primary link URL for the 'WordPress News' dashboard widget.
+ * Filters the primary link URL for the 'WordPress News' dashboard widget.
*
* @since 2.5.0
*
* @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.
+ * Filters the primary feed URL for the 'WordPress News' dashboard widget.
*
* @since 2.3.0
*
@@ -954,7 +1309,7 @@
'url' => apply_filters( 'dashboard_primary_feed', __( 'http://wordpress.org/news/feed/' ) ),
/**
- * Filter the primary link title for the 'WordPress News' dashboard widget.
+ * Filters the primary link title for the 'WordPress News' dashboard widget.
*
* @since 2.3.0
*
@@ -962,14 +1317,14 @@
*/
'title' => apply_filters( 'dashboard_primary_title', __( 'WordPress Blog' ) ),
'items' => 1,
- 'show_summary' => 1,
+ 'show_summary' => 0,
'show_author' => 0,
- 'show_date' => 1,
+ 'show_date' => 0,
),
'planet' => array(
/**
- * Filter the secondary link URL for the 'WordPress News' dashboard widget.
+ * Filters the secondary link URL for the 'WordPress News' dashboard widget.
*
* @since 2.3.0
*
@@ -978,7 +1333,7 @@
'link' => apply_filters( 'dashboard_secondary_link', __( 'https://planet.wordpress.org/' ) ),
/**
- * Filter the secondary feed URL for the 'WordPress News' dashboard widget.
+ * Filters the secondary feed URL for the 'WordPress News' dashboard widget.
*
* @since 2.3.0
*
@@ -987,34 +1342,28 @@
'url' => apply_filters( 'dashboard_secondary_feed', __( 'https://planet.wordpress.org/feed/' ) ),
/**
- * Filter the secondary link title for the 'WordPress News' dashboard widget.
+ * Filters the secondary link title for the 'WordPress News' dashboard widget.
*
* @since 2.3.0
*
* @param string $title Title attribute for the widget's secondary link.
*/
'title' => apply_filters( 'dashboard_secondary_title', __( 'Other WordPress News' ) ),
- 'items' => 3,
+
+ /**
+ * Filters 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,
)
);
- 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 );
}
@@ -1022,105 +1371,29 @@
* Display the WordPress news feeds.
*
* @since 3.8.0
+ * @since 4.8.0 Removed popular plugins feed.
*
* @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 ) {
+ 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 ) as $feed ) {
- 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() );
-
- $ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&plugin=' . $slug, 'install-plugin_' . $slug) . '&TB_iframe=true&width=600&height=800';
- echo "<li class='dashboard-news-plugin'><span>" . __( 'Popular Plugin' ) . ":</span> <a href='$link' class='dashboard-news-plugin-link'>$title</a> <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().
+ * Runs on the {@see 'activity_box_end'} hook in wp_dashboard_right_now().
*
* @since 3.0.0
*
* @return bool|null 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;
@@ -1137,20 +1410,20 @@
$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">
<?php $text = sprintf(
- /* translators: number of megabytes */
+ /* translators: %s: number of megabytes */
__( '%s MB Space Allowed' ),
number_format_i18n( $quota )
);
printf(
- '<a href="%1$s" title="%2$s">%3$s</a>',
+ '<a href="%1$s">%2$s <span class="screen-reader-text">(%3$s)</span></a>',
esc_url( admin_url( 'upload.php' ) ),
- __( 'Manage Uploads' ),
- $text
+ $text,
+ __( 'Manage Uploads' )
); ?>
</li><li class="storage-count <?php echo $used_class; ?>">
<?php $text = sprintf(
@@ -1160,17 +1433,16 @@
$percentused
);
printf(
- '<a href="%1$s" title="%2$s" class="musublink">%3$s</a>',
+ '<a href="%1$s" class="musublink">%2$s <span class="screen-reader-text">(%3$s)</span></a>',
esc_url( admin_url( 'upload.php' ) ),
- __( 'Manage Uploads' ),
- $text
+ $text,
+ __( 'Manage Uploads' )
); ?>
</li>
</ul>
</div>
<?php
}
-add_action( 'activity_box_end', 'wp_dashboard_quota' );
// Display Browser Nag Meta Box
function wp_dashboard_browser_nag() {
@@ -1179,9 +1451,15 @@
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 {
- $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 = '';
@@ -1193,18 +1471,18 @@
}
$notice .= "<p class='browser-update-nag{$browser_nag_class}'>{$msg}</p>";
- $browsehappy = 'http://browsehappy.com/';
- $locale = get_locale();
+ $browsehappy = 'https://browsehappy.com/';
+ $locale = get_user_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 .= '<p class="hide-if-no-js"><a href="" class="dismiss" aria-label="' . esc_attr__( 'Dismiss the browser warning panel' ) . '">' . __( 'Dismiss' ) . '</a></p>';
$notice .= '<div class="clear"></div>';
}
/**
- * Filter the notice output for the 'Browse Happy' nag meta box.
+ * Filters the notice output for the 'Browse Happy' nag meta box.
*
* @since 3.2.0
*
@@ -1214,6 +1492,12 @@
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();
@@ -1237,26 +1521,33 @@
$key = md5( $_SERVER['HTTP_USER_AGENT'] );
if ( false === ($response = get_site_transient('browser_' . $key) ) ) {
- global $wp_version;
+ // include an unmodified $wp_version
+ include( ABSPATH . WPINC . '/version.php' );
+ $url = 'http://api.wordpress.org/core/browse-happy/1.1/';
$options = array(
- 'body' => array( 'useragent' => $_SERVER['HTTP_USER_AGENT'] ),
- 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url()
+ '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 ( wp_http_supports( array( 'ssl' ) ) ) {
+ $url = set_url_scheme( $url, 'https' );
+ }
+
+ $response = wp_remote_post( $url, $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
+ * 'platform' - string - A user-friendly platform name, if it can be determined
+ * 'name' - string - A user-friendly browser name
+ * '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
+ * 'update_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
*/
@@ -1284,21 +1575,22 @@
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’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>
+ <?php if ( current_user_can( 'customize' ) ) : ?>
+ <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>
<?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 $themes_link = current_user_can( 'customize' ) ? add_query_arg( 'autofocus[panel]', 'themes', admin_url( 'customize.php' ) ) : admin_url( 'themes.php' ); ?>
+ <p class="hide-if-no-customize"><?php printf( __( 'or, <a href="%s">change your theme completely</a>' ), $themes_link ); ?></p>
<?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>
@@ -1315,7 +1607,7 @@
</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
@@ -1339,3 +1631,140 @@
</div>
<?php
}
+
+/**
+ * Displays a Try Gutenberg Panel, to introduce people to Gutenberg
+ *
+ * @since 4.9.8
+ */
+function wp_try_gutenberg_panel() {
+ $plugins = get_plugins();
+ $action = $url = $classes = '';
+ $classic_action = $classic_url = $classic_classes = '';
+
+ if ( current_user_can( 'install_plugins' ) ) {
+ if ( empty( $plugins['gutenberg/gutenberg.php'] ) ) {
+ if ( get_filesystem_method( array(), WP_PLUGIN_DIR ) === 'direct' ) {
+ $action = __( 'Install Gutenberg' );
+ $url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=gutenberg' ), 'install-plugin_gutenberg' );
+ $classes = ' install-now';
+ }
+ } else if ( is_plugin_inactive( 'gutenberg/gutenberg.php' ) ) {
+ $action = __( 'Activate Gutenberg' );
+ $url = wp_nonce_url( self_admin_url( 'plugins.php?action=activate&plugin=gutenberg/gutenberg.php&from=try-gutenberg' ), 'activate-plugin_gutenberg/gutenberg.php' );
+ $classes = ' activate-now';
+ }
+
+ if ( empty( $plugins['classic-editor/classic-editor.php'] ) ) {
+ if ( get_filesystem_method( array(), WP_PLUGIN_DIR ) === 'direct' ) {
+ $classic_action = __( 'Install the Classic Editor' );
+ $classic_url = wp_nonce_url( self_admin_url( 'update.php?action=install-plugin&plugin=classic-editor' ), 'install-plugin_classic-editor' );
+ $classic_classes = ' install-now';
+ }
+ } else if ( is_plugin_inactive( 'classic-editor/classic-editor.php' ) ) {
+ $classic_action = __( 'Activate the Classic Editor' );
+ $classic_url = wp_nonce_url( self_admin_url( 'plugins.php?action=activate&plugin=classic-editor/classic-editor.php&from=try-gutenberg' ), 'activate-plugin_classic-editor/classic-editor.php' );
+ $classic_classes = ' activate-now';
+ } else {
+ $classic_action = __( 'The Classic Editor is activated' );
+ $classic_url = wp_nonce_url( self_admin_url( 'plugins.php?action=activate&plugin=classic-editor/classic-editor.php&from=try-gutenberg' ), 'activate-plugin_classic-editor/classic-editor.php' );;
+ $classic_classes = ' button-disabled install-now updated-message';
+ }
+ }
+
+ if ( current_user_can( 'edit_posts' ) && is_plugin_active( 'gutenberg/gutenberg.php' ) ) {
+ $action = __( 'Try Gutenberg' );
+ $url = admin_url( 'admin.php?page=gutenberg' );
+ }
+
+ ?>
+ <div class="try-gutenberg-panel-content">
+ <h2><?php _e( 'A new, modern publishing experience is coming soon.' ); ?></h2>
+
+ <p class="about-description"><?php _e( "Take your words, media, and layout in new directions with Gutenberg, the WordPress editor we're currently building." ); ?></p>
+
+ <hr />
+
+ <div class="try-gutenberg-panel-column-container">
+ <div class="try-gutenberg-panel-column try-gutenberg-panel-image-column">
+ <picture>
+ <source srcset="about:blank" media="(max-width: 1024px)">
+ <img src="https://s.w.org/images/core/gutenberg-screenshot.png?<?php echo date( 'Ymd' ); ?>" alt="<?php esc_attr_e( 'Screenshot from the Gutenberg interface' ); ?>" />
+ </picture>
+ </div>
+ <div class="try-gutenberg-panel-column plugin-card-gutenberg">
+
+ <div>
+ <h3><?php _e( 'Test the new editor today.' ); ?></h3>
+
+ <p>
+ <?php _e( "You can take Gutenberg for a spin (and share your feedback, if you’d like) before we officially release it, by installing it as a plugin." ); ?>
+ <?php
+ printf(
+ /* translators: 1: Gutenberg call for testing handbook link, 2: Gutenberg GitHub repository issues link, 3: Gutenberg GitHub repository CONTRIBUTING.md link */
+ __( 'You can help by <a href="%1$s">testing</a>, <a href="%2$s">filing bugs</a>, or contributing on the <a href="%3$s">GitHub repository</a>.' ),
+ 'https://make.wordpress.org/test/handbook/call-for-testing/gutenberg-testing/',
+ 'https://github.com/WordPress/gutenberg/issues',
+ 'https://github.com/WordPress/gutenberg/blob/master/CONTRIBUTING.md'
+ );
+ ?>
+ </p>
+ </div>
+
+ <div class="try-gutenberg-action">
+ <?php if ( $action ) { ?>
+ <p><a class="button button-primary button-hero<?php echo $classes; ?>" href="<?php echo esc_url( $url ); ?>" data-name="<?php esc_attr_e( 'Gutenberg' ); ?>" data-slug="gutenberg"><?php echo $action; ?></a></p>
+ <?php } ?>
+
+ <p>
+ <?php
+ $learnmore = sprintf(
+ /* translators: Link to https://wordpress.org/gutenberg/ */
+ __( '<a href="%s">Learn more about Gutenberg</a>' ),
+ __( 'https://wordpress.org/gutenberg/' )
+ );
+
+ /**
+ * Filters the "Learn more" link in the Try Gutenberg panel.
+ *
+ * It allows hosts or site owners to change the link, to provide extra
+ * information about Gutenberg, specific to their service.
+ *
+ * WARNING: This filter will only exist in the 4.9.x series, it will not be
+ * added to WordPress 5.0 and later.
+ *
+ * @since 4.9.8
+ */
+ echo apply_filters( 'try_gutenberg_learn_more_link', $learnmore );
+ ?>
+ </p>
+ </div>
+ </div>
+
+ <div class="try-gutenberg-panel-column plugin-card-classic-editor">
+
+ <div>
+ <h3><?php _e( 'Not quite ready?' ); ?></h3>
+
+ <p>
+ <?php _e( 'The new editor will be enabled by default in the next major release of WordPress. If you’re not sure how compatible your current themes and plugins are, we’ve got you covered.' ); ?>
+ <?php
+ printf(
+ /* translators: Link to the Classic Editor plugin page */
+ __( 'Install the <a href="%s">Classic Editor plugin</a> to keep using the current editor until you’re ready to make the switch.' ),
+ __( 'https://wordpress.org/plugins/classic-editor' )
+ );
+ ?>
+ </p>
+ </div>
+
+ <?php if ( $classic_action ) { ?>
+ <div class="try-gutenberg-action">
+ <p><a class="button button-secondary button-hero<?php echo $classic_classes; ?>" href="<?php echo esc_url( $classic_url ); ?>" data-name="<?php esc_attr_e( 'Classic Editor' ); ?>" data-slug="classic-editor"><?php echo $classic_action; ?></a></p>
+ </div>
+ <?php } ?>
+ </div>
+ </div>
+ </div>
+ <?php
+}