Changeset 8273

Timestamp:

02/19/2019 01:53:28 AM (6 years ago)

Author:

dd32

Message:

Theme Directory: API: Return the 'custom-logo' theme tag for WP 4.6+ and setup the wide-blocks and block-styles tags for WP 5.2+.

See ​https://core.trac.wordpress.org/ticket/46272
See #3921.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-themes-api.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-themes-api.php

@@ -276 +276 @@
             unset( $tags[ __( 'Features' ) ]['blavatar'] );
             $tags[ __( 'Features' ) ]['footer-widgets'] = __( 'Footer Widgets' );
+            $tags[ __( 'Features' ) ]['custom-logo']    = __( 'Custom Logo' );
             asort( $tags[ __( 'Features' ) ] ); // To move footer-widgets to the right place.
 
@@ -289 +290 @@
                 'portfolio'      => __( 'Portfolio' ),
             );
+        }
+
+        // Pending https://core.trac.wordpress.org/ticket/46272
+        if ( ! isset( $wp_version ) || version_compare( $wp_version, '5.2-alpha', '>=' ) ) {
+            $tags[ __( 'Layout' ) ]['wide-blocks']    = __( 'Wide Blocks' );
+            $tags[ __( 'Features' ) ]['block-styles'] = __( 'Block Editor Styles' );
+            asort( $tags[ __( 'Features' ) ] ); // To move block-styles to the right place.
         }
 
@@ -429 +437 @@
         }
 
-        $this->fields = array_merge( $this->fields, $defaults, (array) $this->request->fields );
+        if ( isset( $this->request->fields ) ) {
+            $this->fields = array_merge( $this->fields, $defaults, (array) $this->request->fields );
+        } else {
+            $this->fields = array_merge( $this->fields, $defaults );
+        }
 
         // If there is a cached result, return that.