Changeset 4567

Timestamp:

12/22/2016 01:57:11 AM (8 years ago)

Author:

dd32

Message:

Plugin Directory: When running on WordPress.org infrastructure, include wp_json_encode() from our API includes in the event that WordPress wasn't loaded on this request.
This fixes cases where API results were incorrectly encoded due to UTF8 issues, which ultimately caused json_encode() to fail.

See #2112

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/standalone/class-plugins-info-api.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/standalone/class-plugins-info-api.php

@@ -246 +246 @@
             case 'json' :
             case 'jsonp' :
-                $json = json_encode( $response );
+                if ( ! function_exists( 'wp_json_encode' ) && defined( 'WPORGAPIPATH' ) ) {
+                    require WPORGAPIPATH . '/includes/wp-json-encode.php';
+                }
+                $json = function_exists( 'wp_json_encode' ) ? wp_json_encode( $response ) : json_encode( $response );
                 if ( 'jsonp' == $this->format ) {
                     echo "{$this->jsonp}($json)";