Ticket #23930: 23930.diff

wp-includes/user.php

@@ -276 +276 @@
         if ( !$global )
                 $option_name = $wpdb->prefix . $option_name;
 
-        // For backward compatibility. See differences between update_user_meta() and deprecated update_usermeta().
-        // http://core.trac.wordpress.org/ticket/13088
-        if ( is_null( $newvalue ) || is_scalar( $newvalue ) && empty( $newvalue ) )
-                return delete_user_meta( $user_id, $option_name );
-
         return update_user_meta( $user_id, $option_name, $newvalue );
 }
 

wp-content/themes/twentythirteen/functions.php

@@ -84 +84 @@
          * Structured post formats are formats where Twenty Thirteen handles the
          * output instead of the default core HTML output.
          */
-        add_theme_support( 'structured-post-formats', array(
-                'link', 'video'
-        ) );
-        add_theme_support( 'post-formats', array(
-                'aside', 'audio', 'chat', 'gallery', 'image', 'quote', 'status'
-        ) );
+        //add_theme_support( 'structured-post-formats', array(
+        //      'link', 'video'
+        //) );
+        //add_theme_support( 'post-formats', array(
+        //      'aside', 'audio', 'chat', 'gallery', 'image', 'quote', 'status'
+        //) );
 
         // This theme uses wp_nav_menu() in one location.
         register_nav_menu( 'primary', __( 'Navigation Menu', 'twentythirteen' ) );

wp-admin/admin-ajax.php

@@ -56 +56 @@
         'save-widget', 'set-post-thumbnail', 'date_format', 'time_format', 'wp-fullscreen-save-post',
         'wp-remove-post-lock', 'dismiss-wp-pointer', 'upload-attachment', 'get-attachment',
         'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor',
-        'send-attachment-to-editor', 'save-attachment-order', 'heartbeat'
+        'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'show-post-format-ui',
 );
 
 // Register core Ajax calls.

wp-admin/includes/ajax-actions.php

@@ -1135 +1135 @@
         wp_die( 1 );
 }
 
+function wp_ajax_show_post_format_ui() {
+        error_log( serialize( $_REQUEST ) );
+
+        if ( empty( $_POST['post_type'] ) )
+                wp_die( 0 );
+
+        check_ajax_referer( 'show-post-format-ui_' . $_POST['post_type'], 'nonce' );
+
+        if ( ! $post_type_object = get_post_type_object( $_POST['post_type'] ) )
+                wp_die( 0 );
+
+        if ( ! current_user_can( $post_type_object->cap->edit_posts ) )
+                wp_die( -1 );
+
+        error_log( 'Update post_formats_' . $post_type_object->name . ' option for ' . get_current_user_id() . ' to ' . ( empty( $_POST['show'] ) ? 0 : 1 ) );
+
+        update_user_option( get_current_user_id(), 'post_formats_' . $post_type_object->name, empty( $_POST['show'] ) ? 0 : 1 );
+
+        wp_die( 1 );
+}
+
 function wp_ajax_hidden_columns() {
         check_ajax_referer( 'screen-options-nonce', 'screenoptionnonce' );
         $hidden = isset( $_POST['hidden'] ) ? $_POST['hidden'] : '';

wp-admin/includes/post-formats.php

@@ -1 +1 @@
 <?php
+
+defined( 'ABSPATH' ) or die;
+
 global $wp_embed;
 
 $format_meta = get_post_format_meta( $post_ID );
 
+wp_nonce_field( 'show-post-format-ui_' . $post_type, 'show_post_format_ui_nonce', false );
+
 ?>
 <div class="post-format-change"><span class="icon <?php echo esc_attr( $post_format ); ?>"></span> <span class="post-format-description"><?php echo $all_post_formats[$post_format]['description']; ?></span> <a href="#"><?php _e('Change format'); ?></a></div>
 <div class="post-formats-fields">

wp-admin/includes/screen.php

@@ -960 +960 @@
                                                 echo '<label for="wp_welcome_panel-hide">';
                                                 echo '<input type="checkbox" id="wp_welcome_panel-hide"' . checked( (bool) $welcome_checked, true, false ) . ' />';
                                                 echo _x( 'Welcome', 'Welcome panel' ) . "</label>\n";
+                                        } elseif ( 'post' == $this->base && post_type_supports( $this->post_type, 'post-formats' ) && apply_filters( 'enable_post_format_ui', true, $GLOBALS['post'] ) ) {
+                                                $user_wants = get_user_option( 'post_formats_' . $this->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 ) );
+                                                }
+                                                echo '<label for="show_post_format_ui">';
+                                                echo '<input type="checkbox" id="show_post_format_ui"' . checked( $show_post_format_ui, true, false ) . ' />';
+                                                echo __( 'Post Formats' ) . "</label>\n";
                                         }
                                 ?>
                                 <br class="clear" />

wp-admin/js/post-formats.js

@@ -64 +64 @@
 
         $(function(){
 
+                $('#show_post_format_ui').on('change', function() {
+                        $('.some-element').toggleClass('.no-ui', ! this.checked );
+                        $.post( ajaxurl, {
+                                action: 'show-post-format-ui',
+                                post_type: $('#post_type').val(),
+                                show: this.checked ? 1 : 0,
+                                nonce: $('#show_post_format_ui_nonce').val()
+                        });
+                });
+
                 $('.post-format-change a').click(function() {
                         $('.post-formats-fields, .post-format-change').slideUp();
                         $('.post-format-options').slideDown();

wp-admin/edit-form-advanced.php

@@ -143 +143 @@
                         $post_format_set_class = '';
         }
 
+        $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 ) );
+        }
+
+        // Use $show_post_format_ui to set a class.
+
         $format_class = " class='wp-format-{$post_format}'";