Ticket #5858: 5858.diff

wp-admin/includes/dashboard.php

@@ -22 +22 @@
         /* Register Widgets and Controls */
 
         // Recent Comments Widget
-        if ( $mod_comments = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'") ) {
+        if ( current_user_can( 'moderate_comments' ) && $mod_comments = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'") ) {
                 $notice = sprintf( __ngettext( '%d comment awaiting moderation', '%d comments awaiting moderation', $mod_comments ), $mod_comments );
                 $notice = "<a href='moderation.php'>$notice</a>";
         } else {
@@ -127 +127 @@
         do_action( 'wp_dashboard_setup' );
 
         // Hard code the sidebar's widgets and order
-        $dashboard_widgets = array( 'dashboard_recent_comments', 'dashboard_incoming_links', 'dashboard_primary', 'dashboard_plugins', 'dashboard_secondary' );
+        $dashboard_widgets = array();
+        $dashboard_widgets[] = 'dashboard_recent_comments';
+        $dashboard_widgets[] = 'dashboard_incoming_links';
+        $dashboard_widgets[] = 'dashboard_primary';
+        if ( current_user_can( 'activate_plugins' ) )
+                $dashboard_widgets[] = 'dashboard_plugins';
+        $dashboard_widgets[] = 'dashboard_secondary';
 
         // Filter widget order
         $dashboard_widgets = apply_filters( 'wp_dashboard_widgets', $dashboard_widgets );

wp-admin/index.php

@@ -39 +39 @@
 <h2><?php _e('Dashboard'); ?></h2>
 
 <div id="rightnow">
-<h3 class="reallynow"><span><?php _e('Right Now'); ?></span> <a href="post-new.php" class="rbutton"><strong><?php _e('Write a New Post'); ?></strong></a> <a href="page-new.php" class="rbutton"><?php _e('Write a New Page'); ?></a><br class="clear" /></h3>
+<h3 class="reallynow">
+        <span><?php _e('Right Now'); ?></span>
 
+<?php if ( $can_edit_posts = current_user_can( 'edit_posts' ) ) : ?>
+        <a href="post-new.php" class="rbutton"><strong><?php _e('Write a New Post'); ?></strong></a>
+<?php endif; if ( $can_edit_pages = current_user_can( 'edit_pages' ) ) : ?>
+        <a href="page-new.php" class="rbutton"><?php _e('Write a New Page'); ?></a>
+<?php endif; ?>
+        <br class="clear" />
+</h3>
+
 <?php
 $num_posts = wp_count_posts( 'post' );
 $num_pages = wp_count_posts( 'page' );
@@ -51 +60 @@
 
 $post_type_texts = array();
 
-if ( !empty($num_posts->publish) ) {
-        $post_type_texts[] = '<a href="edit.php">'.sprintf( __ngettext( '%s post', '%s posts', $num_posts->publish ), number_format_i18n( $num_posts->publish ) ).'</a>';
+if ( !empty($num_posts->publish) ) { // with feeds, anyone can tell how many posts there are.  Just unlink if !current_user_can
+        $post_text = sprintf( __ngettext( '%s post', '%s posts', $num_posts->publish ), number_format_i18n( $num_posts->publish ) );
+        $post_type_texts[] = $can_edit_posts ? "<a href='edit.php'>$post_text</a>" : $post_text;
 }
-if ( !empty($num_pages->publish) ) {
+if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds.  Don't show if !current_user_can
         $post_type_texts[] = '<a href="edit-pages.php">'.sprintf( __ngettext( '%s page', '%s pages', $num_pages->publish ), number_format_i18n( $num_pages->publish ) ).'</a>';
 }
-if ( !empty($num_posts->draft) ) {
+if ( $can_edit_posts && !empty($num_posts->draft) ) {
         $post_type_texts[] = '<a href="edit.php?post_status=draft">'.sprintf( __ngettext( '%s draft', '%s drafts', $num_posts->draft ), number_format_i18n( $num_posts->draft ) ).'</a>';
 }
-if ( !empty($num_posts->future) ) {
+if ( $can_edit_posts && !empty($num_posts->future) ) {
         $post_type_texts[] = '<a href="edit.php?post_status=future">'.sprintf( __ngettext( '%s scheduled post', '%s scheduled posts', $num_posts->future ), number_format_i18n( $num_posts->future ) ).'</a>';
 }
 
-$cats_text = '<a href="categories.php">'.sprintf( __ngettext( '%s category', '%s categories', $num_cats ), number_format_i18n( $num_cats ) ).'</a>';
-$tags_text = '<a href="edit-tags.php">'.sprintf( __ngettext( '%s tag', '%s tags', $num_tags ), number_format_i18n( $num_tags ) ).'</a>';
+$cats_text = sprintf( __ngettext( '%s category', '%s categories', $num_cats ), number_format_i18n( $num_cats ) );
+$tags_text = sprintf( __ngettext( '%s tag', '%s tags', $num_tags ), number_format_i18n( $num_tags ) );
+if ( current_user_can( 'manage_categories' ) ) {
+        $cats_text = "<a href='categories.php'>$cats_text</a>";
+        $tags_text = "<a href='edit-tags.php'>$tags_text</a>";
+}
 
 $post_type_text = implode(', ', $post_type_texts);
 
@@ -79 +93 @@
 $sidebars_widgets = wp_get_sidebars_widgets();
 $num_widgets = array_reduce( $sidebars_widgets, create_function( '$prev, $curr', 'return $prev+count($curr);' ) );
 $widgets_text = sprintf( __ngettext( '%d widget', '%d widgets', $num_widgets ), $num_widgets );
+if ( $can_switch_themes = current_user_can( 'switch_themes' ) )
+        $widgets_text = "<a href='widgets.php'>$widgets_text</a>";
 ?>
-<p><?php printf( __( 'You are using %1$s theme with %2$s.' ), $ct->title, "<a href='widgets.php'>$widgets_text</a>" ); ?> <a href="themes.php" class="rbutton"><?php _e('Change Theme'); ?></a> You're using BetaPress TODO.</p>
+<p>
+        <?php printf( __( 'You are using %1$s theme with %2$s.' ), $ct->title, $widgets_text ); ?>
+<?php if ( $can_switch_themes ) : ?>
+        <a href="themes.php" class="rbutton"><?php _e('Change Theme'); ?></a>
+<?php endif; ?>
+        You're using BetaPress TODO.
+</p>
 <?php do_action( 'rightnow_end' ); ?>
 <?php do_action( 'activity_box_end' ); ?>
 </div><!-- rightnow -->