Query: Improve sanitization within WP_Meta_Query.

Props vortfu, xknown, dd32. Built from https://develop.svn.wordpress.org/trunk@52455 git-svn-id: http://core.svn.wordpress.org/trunk@52047 1a063a9b-81f0-0310-95a4-ce76da25c4cd
WordPress · Jan 6, 2022 · c9c4dab · c9c4dab
1 parent 271b1f6
commit c9c4dab
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/wp-includes/class-wp-meta-query.php b/wp-includes/class-wp-meta-query.php
@@ -848,7 +848,7 @@ protected function find_compatible_table_alias( $clause, $parent_query ) {
 			$clause_compare  = strtoupper( $clause['compare'] );
 			$sibling_compare = strtoupper( $sibling['compare'] );
 			if ( in_array( $clause_compare, $compatible_compares, true ) && in_array( $sibling_compare, $compatible_compares, true ) ) {
-				$alias = $sibling['alias'];
+				$alias = preg_replace( '/\W/', '_', $sibling['alias'] );
 				break;
 			}
 		}

diff --git a/wp-includes/class-wp-tax-query.php b/wp-includes/class-wp-tax-query.php
@@ -527,7 +527,7 @@ protected function find_compatible_table_alias( $clause, $parent_query ) {
 
 			// The sibling must both have compatible operator to share its alias.
 			if ( in_array( strtoupper( $sibling['operator'] ), $compatible_operators, true ) ) {
-				$alias = $sibling['alias'];
+				$alias = preg_replace( '/\W/', '_', $sibling['alias'] );
 				break;
 			}
 		}

diff --git a/wp-includes/version.php b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.0-alpha-52454';
+$wp_version = '6.0-alpha-52455';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.