When 'rest_route' URL var is used it's a REST request

gmazzap · gmazzap · commit d41b3b5d6fc8 · 2021-10-19T14:40:19.000+02:00
diff --git a/src/WpContext.php b/src/WpContext.php
@@ -105,12 +105,15 @@ final public static function determine(): WpContext
      */
     private static function isRestRequest(): bool
     {
-        if (defined('REST_REQUEST') && REST_REQUEST) {
+        if (
+            (defined('REST_REQUEST') && REST_REQUEST)
+            || !empty($_GET['rest_route']) // phpcs:ignore
+        ) {
             return true;
         }
 
         if (!get_option('permalink_structure')) {
-            return !empty($_GET['rest_route']); // phpcs:ignore
+            return false;
         }
 
         /*

Original file line number	Diff line number	Diff line change
`@@ -105,12 +105,15 @@ final public static function determine(): WpContext`
`105`	`105`	`*/`
`106`	`106`	`private static function isRestRequest(): bool`
`107`	`107`	`{`
`108`		`- if (defined('REST_REQUEST') && REST_REQUEST) {`
	`108`	`+ if (`
	`109`	`+ (defined('REST_REQUEST') && REST_REQUEST)`
	`110`	`+ \|\| !empty($_GET['rest_route']) // phpcs:ignore`
	`111`	`+ ) {`
`109`	`112`	`return true;`
`110`	`113`	`}`
`111`	`114`
`112`	`115`	`if (!get_option('permalink_structure')) {`
`113`		`- return !empty($_GET['rest_route']); // phpcs:ignore`
	`116`	`+ return false;`
`114`	`117`	`}`
`115`	`118`
`116`	`119`	`/*`