Changeset 21107

Timestamp:

06/25/2012 07:56:48 PM (14 years ago)

Author:

markjaquith

Message:

Properly show comments on Page edit screen. props duck_. fixes #20937 for trunk

File:

• trunk/wp-admin/includes/meta-boxes.php (modified) (3 diffs)

trunk/wp-admin/includes/meta-boxes.php

@@ -477 +477 @@
     <?php
 
-    $total = $wpdb->get_var($wpdb->prepare("SELECT count(1) FROM $wpdb->comments WHERE comment_post_ID = '%d' AND ( comment_approved = '0' OR comment_approved = '1')", $post_ID));
+    $total = get_comments( array( 'post_id' => $post_ID, 'number' => 1, 'count' => true ) );
     $wp_list_table = _get_list_table('WP_Post_Comments_List_Table');
     $wp_list_table->display( true );
@@ -484 +484 @@
         echo '<p id="no-comments">' . __('No comments yet.') . '</p>';
     } else {
-        $hidden = get_hidden_meta_boxes('post');
+        $hidden = get_hidden_meta_boxes( get_current_screen() );
         if ( ! in_array('commentsdiv', $hidden) ) {
             ?>
@@ -490 +490 @@
             <?php
         }
+
+        ?>
+        <p class="hide-if-no-js" id="show-comments"><a href="#commentstatusdiv" onclick="commentsBox.get(<?php echo $total; ?>);return false;"><?php _e('Show comments'); ?></a> <img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" /></p>
+        <?php
     }
-
-    ?>
-    <p class="hide-if-no-js hidden" id="show-comments"><a href="#commentstatusdiv" onclick="commentsBox.get(<?php echo $total; ?>);return false;"><?php _e('Show comments'); ?></a> <img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" /></p>
-    <?php
 
     wp_comment_trashnotice();