WordPress 3.4.2-scripts

[autoinstalls/wordpress.git] / wp-admin / includes / meta-boxes.php

diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php
index 7dc455286b371cb7c7a016664371338ce5123ae7..fde0af8c76b6b7b621dc0f25849ff31cf55bbc00 100644 (file)
--- a/wp-admin/includes/meta-boxes.php
+++ b/wp-admin/includes/meta-boxes.php
@@ -483,17 +483,17 @@ function post_comment_meta_box($post) {
        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 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
+               ?>
+               <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
+       }
 
        wp_comment_trashnotice();
 }
@@ -688,7 +688,7 @@ function link_categories_meta_box($link) {
                <p id="link-category-add" class="wp-hidden-child">
                        <label class="screen-reader-text" for="newcat"><?php _e( '+ Add New Category' ); ?></label>
                        <input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php esc_attr_e( 'New category name' ); ?>" aria-required="true" />
-                       <input type="button" id="category-add-submit" class="add:categorychecklist:linkcategorydiv button" value="<?php esc_attr_e( 'Add' ); ?>" />
+                       <input type="button" id="link-category-add-submit" class="add:categorychecklist:linkcategorydiv button" value="<?php esc_attr_e( 'Add' ); ?>" />
                        <?php wp_nonce_field( 'add-link-category', '_ajax_nonce', false ); ?>
                        <span id="category-ajax-response"></span>
                </p>