Changeset 47351 for trunk/src/wp-includes/rest-api/class-wp-rest-server.php

Timestamp:

02/24/2020 06:05:12 PM (7 years ago)

Author:

kadamwhite

Message:

REST API: Fix namespace shadowing issue in route matching logic.

Following [47260] a namespace such as "test-ns" prevents any namespace such as "test-ns/v1" from being found when matching routes.
While not best practice, this was an unintentional back-compat break; this patch restores the original behavior.

Props david.binda, TimothyBlynJacobs.
Fixes #48530.

File:

• trunk/src/wp-includes/rest-api/class-wp-rest-server.php (modified) (1 diff)

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

@@ -880 +880 @@
                 $path   = $request->get_route();
 
-                $routes = array();
+                $with_namespace = array();
 
                 foreach ( $this->get_namespaces() as $namespace ) {
-                        if ( 0 === strpos( ltrim( $path, '/' ), $namespace ) ) {
-                                $routes = $this->get_routes( $namespace );
-                                break;
-                        }
-                }
-
-                if ( ! $routes ) {
+                        if ( 0 === strpos( trailingslashit( ltrim( $path, '/' ) ), $namespace ) ) {
+                                $with_namespace[] = $this->get_routes( $namespace );
+                        }
+                }
+
+                if ( $with_namespace ) {
+                        $routes = array_merge( ...$with_namespace );
+                } else {
                         $routes = $this->get_routes();
                 }