Ticket #20937: 20937.diff

wp-admin/includes/meta-boxes.php

@@ -476 +476 @@
         <p class="hide-if-no-js" id="add-new-comment"><a href="#commentstatusdiv" onclick="commentReply.addcomment(<?php echo $post_ID; ?>);return false;"><?php _e('Add comment'); ?></a></p>
         <?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));
         $wp_list_table = _get_list_table('WP_Post_Comments_List_Table');
         $wp_list_table->display( true );
 
+        $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));
         if ( 1 > $total ) {
                 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) ) {
                         ?>
                         <script type="text/javascript">jQuery(document).ready(function(){commentsBox.get(<?php echo $total; ?>, 10);});</script>
                         <?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();
 }