Changeset 36529 for trunk/src/wp-includes/rest-api.php

Timestamp:

02/16/2016 01:11:31 AM (9 years ago)

Author:

rmccue

Message:

REST API: Add helper function to get server instance.

This allows using rest_do_request() outside of the API itself easily.

Props danielbachhuber, swissspidy.

File:

• trunk/src/wp-includes/rest-api.php (modified) (2 diffs)

trunk/src/wp-includes/rest-api.php

@@ -141 +141 @@
     define( 'REST_REQUEST', true );
 
-    /** @var WP_REST_Server $wp_rest_server */
-    global $wp_rest_server;
-
-    /**
-     * Filter the REST Server Class.
-     *
-     * This filter allows you to adjust the server class used by the API, using a
-     * different class to handle requests.
-     *
-     * @since 4.4.0
-     *
-     * @param string $class_name The name of the server class. Default 'WP_REST_Server'.
-     */
-    $wp_rest_server_class = apply_filters( 'wp_rest_server_class', 'WP_REST_Server' );
-    $wp_rest_server = new $wp_rest_server_class;
-
-    /**
-     * Fires when preparing to serve an API request.
-     *
-     * Endpoint objects should be created and register their hooks on this action rather
-     * than another action to ensure they're only loaded when needed.
-     *
-     * @since 4.4.0
-     *
-     * @param WP_REST_Server $wp_rest_server Server object.
-     */
-    do_action( 'rest_api_init', $wp_rest_server );
+    // Initialize the server.
+    $server = rest_get_server();
 
     // Fire off the request.
-    $wp_rest_server->serve_request( $GLOBALS['wp']->query_vars['rest_route'] );
+    $server->serve_request( $GLOBALS['wp']->query_vars['rest_route'] );
 
     // We're done.
@@ -274 +249 @@
  */
 function rest_do_request( $request ) {
+    $request = rest_ensure_request( $request );
+    return rest_get_server()->dispatch( $request );
+}
+
+/**
+ * Get the current REST server instance.
+ *
+ * Instantiates a new instance if none exists already.
+ *
+ * @since 4.5.0
+ *
+ * @global WP_REST_Server $wp_rest_server REST server instance.
+ *
+ * @return  WP_REST_Server REST server instance.
+ */
+function rest_get_server() {
+    /* @var WP_REST_Server $wp_rest_server */
     global $wp_rest_server;
-    $request = rest_ensure_request( $request );
-    return $wp_rest_server->dispatch( $request );
+
+    if ( empty( $wp_rest_server ) ) {
+        /**
+         * Filter the REST Server Class.
+         *
+         * This filter allows you to adjust the server class used by the API, using a
+         * different class to handle requests.
+         *
+         * @since 4.4.0
+         *
+         * @param string $class_name The name of the server class. Default 'WP_REST_Server'.
+         */
+        $wp_rest_server_class = apply_filters( 'wp_rest_server_class', 'WP_REST_Server' );
+        $wp_rest_server = new $wp_rest_server_class;
+
+        /**
+         * Fires when preparing to serve an API request.
+         *
+         * Endpoint objects should be created and register their hooks on this action rather
+         * than another action to ensure they're only loaded when needed.
+         *
+         * @since 4.4.0
+         *
+         * @param WP_REST_Server $wp_rest_server Server object.
+         */
+        do_action( 'rest_api_init', $wp_rest_server );
+    }
+
+    return $wp_rest_server;
 }