WordPress 3.8.1-scripts

[autoinstalls/wordpress.git] / wp-admin / edit-form-advanced.php

diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index dab3f84e5e8a2647bde6e079ce8b9c8ea850611e..7970b8c5af66efb880f77bfd89c357349f73f2e5 100644 (file)
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -147,7 +147,7 @@ if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post_type,
 // all taxonomies
 foreach ( get_object_taxonomies( $post ) as $tax_name ) {
        $taxonomy = get_taxonomy( $tax_name );
-       if ( ! $taxonomy->show_ui )
+       if ( ! $taxonomy->show_ui || false === $taxonomy->meta_box_cb )
                continue;
 
        $label = $taxonomy->labels->name;
@@ -359,7 +359,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
-<?php screen_icon(); ?>
 <h2><?php
 echo esc_html( $title );
 if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) )
@@ -557,7 +556,7 @@ if ( 'page' == $post_type ) {
        /**
         * Fires after 'normal' context meta boxes have been output for the 'page' post type.
         *
-        * @since 1.5.2
+        * @since 1.5.0
         *
         * @param WP_Post $post Post object.
         */
@@ -567,7 +566,7 @@ else {
        /**
         * Fires after 'normal' context meta boxes have been output for all post types other than 'page'.
         *
-        * @since 1.5.2
+        * @since 1.5.0
         *
         * @param WP_Post $post Post object.
         */