Index: /sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-themes-api.php
===================================================================
--- /sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-themes-api.php (revision 8272)
+++ /sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/class-themes-api.php (revision 8273)
@@ -276,4 +276,5 @@
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,4 +290,11 @@
'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,5 +437,9 @@
}
- $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.