Changeset 39630 for branches/4.7/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php

Timestamp:

12/21/2016 05:29:24 AM (8 years ago)

Author:

pento

Message:

REST API: Fix PHP warnings when get_theme_support( 'post-formats' ) is not an array.

If add_theme_support( 'post-formats' ) is called with no additional arguments, then get_theme_support( 'post-formats' ) returns true rather than an array of supported formats. Avoid generating PHP warnings in this situation.

Merge of [39620] to the 4.7 branch.

Props dreamon11, ChopinBach.
Fixes #39293.

Location:

branches/4.7

Files:

• . (modified) (1 prop)
• src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php (modified) (1 diff)

branches/4.7/src/wp-includes/rest-api/endpoints/class-wp-rest-posts-controller.php

@@ -1924 +1924 @@
                 case 'post-formats':
                     $supports_formats = get_theme_support( 'post-formats' );
+
+                    // Force to an array. Supports formats can return true even if empty in some cases.
+                    $supports_formats = is_array( $supports_formats ) ? array_values( $supports_formats[0] ) : array();
+
+                    $supported_formats = array_merge( array( 'standard' ), $supports_formats );
+
                     $schema['properties']['format'] = array(
                         'description' => __( 'The format for the object.' ),
                         'type'        => 'string',
-                        'enum'        => array_merge( array( 'standard' ), $supports_formats ? array_values( $supports_formats[0] ) : array() ),
+                        'enum'        => $supported_formats,
                         'context'     => array( 'view', 'edit' ),
                     );