REST API: in WP_REST_Server::dispatch(), move preg_match() out of it's current loop, which doesn't affect the context passed to it.

staylor · staylor · commit dc3f5a0cf501 · 2015-11-04T21:22:21.000Z
Props TobiasBg. Fixes #34488. git-svn-id: https://develop.svn.wordpress.org/trunk@35514 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-includes/rest-api/class-wp-rest-server.php b/src/wp-includes/rest-api/class-wp-rest-server.php
@@ -763,6 +763,12 @@ public function dispatch( $request ) {
 		$path   = $request->get_route();
 
 		foreach ( $this->get_routes() as $route => $handlers ) {
+			$match = preg_match( '@^' . $route . '$@i', $path, $args );
+
+			if ( ! $match ) {
+				continue;
+			}
+
 			foreach ( $handlers as $handler ) {
 				$callback  = $handler['callback'];
 				$response = null;
@@ -771,12 +777,6 @@ public function dispatch( $request ) {
 					continue;
 				}
 
-				$match = preg_match( '@^' . $route . '$@i', $path, $args );
-
-				if ( ! $match ) {
-					continue;
-				}
-
 				if ( ! is_callable( $callback ) ) {
 					$response = new WP_Error( 'rest_invalid_handler', __( 'The handler for the route is invalid' ), array( 'status' => 500 ) );
 				}
