Merge branch 'develop' into trunk

10up · Jan 22, 2024 · 47f868c · 47f868c
2 parents 7958a8c + 5b20cc2
commit 47f868c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 19 deletions.
diff --git a/.changeset/cyan-badgers-smile.md b/.changeset/cyan-badgers-smile.md
@@ -0,0 +1,5 @@
+---
+"@headstartwp/headstartwp": patch
+---
+
+Ensure htmlspecialchars receives an empty string instead of null to fix deprecation warnings.
diff --git a/package-lock.json b/package-lock.json
diff --git a/wp/headless-wp/.wp-env.json b/wp/headless-wp/.wp-env.json
@@ -2,7 +2,7 @@
   "plugins": [
     ".",
     "../local-plugin",
-    "https://downloads.wordpress.org/plugin/wordpress-seo.19.14.zip",
-    "https://downloads.wordpress.org/plugin/safe-redirect-manager.1.11.1.zip"
+    "https://downloads.wordpress.org/plugin/wordpress-seo.21.8.1.zip",
+    "https://downloads.wordpress.org/plugin/safe-redirect-manager.2.1.1.zip"
   ]
 }
diff --git a/wp/headless-wp/includes/classes/API.php b/wp/headless-wp/includes/classes/API.php
@@ -98,7 +98,7 @@ public function modify_rest_params( $args, $request ) {
 			return $args;
 		}
 
-		$author = htmlspecialchars( filter_input( INPUT_GET, 'author' ) );
+		$author = htmlspecialchars( filter_input( INPUT_GET, 'author' ) ?? '' );
 
 		if ( ! empty( $author ) && ! is_numeric( $author ) ) {
 			unset( $args['author__in'] );
@@ -108,10 +108,10 @@ public function modify_rest_params( $args, $request ) {
 		$taxonomies = wp_list_filter( get_object_taxonomies( $args['post_type'], 'objects' ), [ 'show_in_rest' => true ] );
 
 		foreach ( $taxonomies as $taxonomy ) {
-			$term = htmlspecialchars( filter_input( INPUT_GET, $taxonomy->name ) );
+			$term = htmlspecialchars( filter_input( INPUT_GET, $taxonomy->name ) ?? '' );
 
 			if ( ! $term ) {
-				$term = htmlspecialchars( filter_input( INPUT_GET, $taxonomy->rest_base ) );
+				$term = htmlspecialchars( filter_input( INPUT_GET, $taxonomy->rest_base ) ?? '' );
 			}
 
 			if ( ! empty( $term ) && ! is_numeric( $term ) ) {