+
id, 'side', '' ); ?>
-
+
id, 'column3', '' ); ?>
-
+
id, 'column4', '' ); ?>
@@ -218,11 +246,6 @@ function wp_dashboard() {
* @since 2.7.0
*/
function wp_dashboard_right_now() {
- $theme = wp_get_theme();
- if ( current_user_can( 'switch_themes' ) )
- $theme_name = sprintf( '
%1$s', $theme->display('Name') );
- else
- $theme_name = $theme->display('Name');
?>
@@ -248,22 +271,27 @@ function wp_dashboard_right_now() {
}
// Comments
$num_comm = wp_count_comments();
- if ( $num_comm && $num_comm->total_comments ) {
- $text = sprintf( _n( '%s Comment', '%s Comments', $num_comm->total_comments ), number_format_i18n( $num_comm->total_comments ) );
+ 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 ) );
?>
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 ) );
- ?>
-
- moderated );
+ /* translators: Number of comments in moderation */
+ $text = sprintf( _nx( '%s in moderation', '%s in moderation', $num_comm->moderated, 'comments' ), $moderated_comments_count_i18n );
+ /* translators: 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 );
+ ?>
+
+ $content";
+ echo "$content
";
}
?>
@@ -349,6 +379,9 @@ function wp_dashboard_right_now() {
" method="get">
-
- 'submit_users' ) ); ?>
+
+
+ 'submit_users' ) ); ?>
-
+
@@ -490,6 +534,8 @@ function wp_dashboard_quick_press( $error_msg = false ) {
* 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 ) {
@@ -501,6 +547,16 @@ function wp_dashboard_recent_drafts( $drafts = false ) {
'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;
@@ -509,17 +565,18 @@ function wp_dashboard_recent_drafts( $drafts = false ) {
echo '
';
if ( count( $drafts ) > 3 ) {
- echo '
' . _x( 'View all', 'drafts' ) . "
\n";
+ echo '
' . _x( 'View all', 'drafts' ) . "
\n";
}
- echo '
' . __( 'Drafts' ) . "
\n
";
+ echo '' . __( 'Drafts' ) . "
\n";
$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 "- \n";
- echo '';
+ /* translators: %s: post title */
+ echo '';
if ( $the_content = wp_trim_words( $draft->post_content, 10 ) ) {
echo '
' . $the_content . '
';
}
@@ -528,29 +585,39 @@ function wp_dashboard_recent_drafts( $drafts = false ) {
echo "
\n
";
}
+/**
+ * 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 = strip_tags(get_the_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 = "
$comment_post_title";
} else {
- $comment_post_link = $comment_post_title;
+ $comment_post_link = '';
}
- $comment_link = '';
-
$actions_string = '';
if ( current_user_can( 'edit_comment', $comment->comment_ID ) ) {
- // preorder it: Approve | Reply | Edit | Spam | Trash
+ // Pre-order it: Approve | Reply | Edit | Spam | Trash.
$actions = array(
'approve' => '', 'unapprove' => '',
'reply' => '',
'edit' => '',
'spam' => '',
- 'trash' => '', 'delete' => ''
+ 'trash' => '', 'delete' => '',
+ 'view' => '',
);
$del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
@@ -562,26 +629,30 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
$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'] = "
" . __( 'Approve' ) . '';
- $actions['unapprove'] = "
" . __( 'Unapprove' ) . '';
- $actions['edit'] = "
". __('Edit') . '';
- $actions['reply'] = '
' . __('Reply') . '';
- $actions['spam'] = "
" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '';
- if ( !EMPTY_TRASH_DAYS )
- $actions['delete'] = "
" . __('Delete Permanently') . '';
- else
- $actions['trash'] = "
" . _x('Trash', 'verb') . '';
+ $actions['approve'] = "
" . __( 'Approve' ) . '';
+ $actions['unapprove'] = "
" . __( 'Unapprove' ) . '';
+ $actions['edit'] = "
". __( 'Edit' ) . '';
+ $actions['reply'] = '
' . __( 'Reply' ) . '';
+ $actions['spam'] = "
" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '';
+
+ if ( ! EMPTY_TRASH_DAYS ) {
+ $actions['delete'] = "
" . __( 'Delete Permanently' ) . '';
+ } else {
+ $actions['trash'] = "
" . _x( 'Trash', 'verb' ) . '';
+ }
+
+ $actions['view'] = '';
/**
- * 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 );
@@ -591,52 +662,94 @@ function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
( ( ('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 .= "
$sep$link";
}
}
-
?>
-