Ticket #26066: 26066.patch

src/wp-admin/includes/dashboard.php

@@ -179 +179 @@
         <ul>
         <?php
         do_action( 'rightnow_list_start' );
-        // Using show_in_nav_menus as my arg for grabbing what post types should show, is there better?
-        $post_types = get_post_types( array( 'show_in_nav_menus' => true ), 'objects' );
-        $post_types = (array) apply_filters( 'rightnow_post_types', $post_types );
-        foreach ( $post_types as $post_type => $post_type_obj ){
+        // Posts and Pages
+        foreach ( array( 'post', 'page' ) as $post_type ) {
                 $num_posts = wp_count_posts( $post_type );
                 if ( $num_posts && $num_posts->publish ) {
+                        if ( 'post' == $post_type )
+                                $text = _n( 'Post', 'Posts', $num_posts->publish );
+                        else
+                                $text = _n( 'Page', 'Pages', $num_posts->publish );
                         printf(
                                 '<li class="%1$s-count"><a href="edit.php?post_type=%1$s">%2$s %3$s</a></li>',
                                 $post_type,
                                 number_format_i18n( $num_posts->publish ),
-                                $post_type_obj->label
+                                $text
                         );
                 }
         }
@@ -203 +205 @@
                         $text
                 );
                 if ( $num_comm->moderated ) {
-                        $text = _n( 'in moderation', 'in moderation', $num_comm->total_comments );
+                        $text = _n( 'in moderation', 'in moderation', $num_comm->moderated );
                         printf(
                                 '<li class="comment-mod-count"><a href="edit-comments.php?comment_status=moderated">%1$s %2$s</a></li>',
                                 number_format_i18n( $num_comm->moderated ),