From a376b4e284e4e830a8996d552c4596e69ad45c63 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Fri, 14 Dec 2018 06:03:35 +0000 Subject: [PATCH] REST API: Improve performance by avoiding `call_user_func()`. The `get_compact_response_links()` method was introduced in WP 4.5, and this conditional is no longer necessary. Merges [43834] from the 5.0 branch to trunk. Props schlessera, timothyblynjacobs. Fixes #45189. git-svn-id: https://develop.svn.wordpress.org/trunk@44173 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/rest-api.php | 6 +----- .../rest-api/endpoints/class-wp-rest-controller.php | 7 +------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/wp-includes/rest-api.php b/src/wp-includes/rest-api.php index 26593af44a..1c8bb4620e 100644 --- a/src/wp-includes/rest-api.php +++ b/src/wp-includes/rest-api.php @@ -1367,11 +1367,7 @@ function rest_preload_api_request( $memo, $path ) { if ( 200 === $response->status ) { $server = rest_get_server(); $data = (array) $response->get_data(); - if ( method_exists( $server, 'get_compact_response_links' ) ) { - $links = call_user_func( array( $server, 'get_compact_response_links' ), $response ); - } else { - $links = call_user_func( array( $server, 'get_response_links' ), $response ); - } + $links = $server->get_compact_response_links( $response ); if ( ! empty( $links ) ) { $data['_links'] = $links; } diff --git a/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php b/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php index dbd129cc43..389262274f 100644 --- a/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php +++ b/src/wp-includes/rest-api/endpoints/class-wp-rest-controller.php @@ -212,12 +212,7 @@ abstract class WP_REST_Controller { $data = (array) $response->get_data(); $server = rest_get_server(); - - if ( method_exists( $server, 'get_compact_response_links' ) ) { - $links = call_user_func( array( $server, 'get_compact_response_links' ), $response ); - } else { - $links = call_user_func( array( $server, 'get_response_links' ), $response ); - } + $links = $server->get_compact_response_links( $response ); if ( ! empty( $links ) ) { $data['_links'] = $links;