Changeset 24264 for trunk/wp-admin/edit-form-advanced.php

Timestamp:

05/15/2013 08:43:09 PM (8 years ago)

Author:

azaozz

Message:

Fix showing and hiding of UI elements when disabling the Post Formats UI, props kovshenin, see #24327

File:

• trunk/wp-admin/edit-form-advanced.php (modified) (4 diffs)

trunk/wp-admin/edit-form-advanced.php

@@ -131 +131 @@
 $post_format = '';
 $post_format_options = '';
-$show_post_format_ui = false;
 if ( post_type_supports( $post_type, 'post-formats' ) && apply_filters( 'enable_post_format_ui', true, $post ) ) {
     wp_enqueue_script( 'post-formats' );
@@ -143 +142 @@
         if ( ! empty( $_REQUEST['format'] ) && in_array( $_REQUEST['format'], get_post_format_slugs() ) )
             $post_format = $_REQUEST['format'];
-    }
-
-    $user_wants = get_user_option( 'post_formats_' . $post_type );
-    if ( false !== $user_wants ) {
-        // User wants what user gets.
-        $show_post_format_ui = (bool) $user_wants;
-    } else {
-        // UI is shown when the theme supports formats, or if the site has formats assigned to posts.
-        $show_post_format_ui = current_theme_supports( 'post-formats' ) || get_terms( 'post_format', array( 'number' => 1 ) );
     }
 
@@ -390 +380 @@
 </div>
 <?php if ( ! empty( $post_format_options ) ) : ?>
-<div class="wp-post-format-ui<?php if ( ! $show_post_format_ui ) echo ' no-ui' ?>">
+<div class="wp-post-format-ui">
     <div class="post-format-options">
         <?php echo $post_format_options; ?>
@@ -423 +413 @@
 <div id="post-body-content"<?php echo $format_class; ?>>
 <?php if ( ! empty( $all_post_formats ) ) : ?>
-<div class="wp-post-format-ui<?php if ( ! $show_post_format_ui ) echo ' no-ui' ?>">
+<div class="wp-post-format-ui">
     <div class="post-format-change"><span class="icon <?php echo esc_attr( 'wp-format-' . $post_format ); ?>"></span> <span class="post-format-description"><?php echo $all_post_formats[$post_format]['description']; ?></span></div>
 </div>