Merge branch 'backport/sql-parser-changes'

aristath · aristath · commit cc3511eaccfb · 2024-01-09T12:36:49.000+02:00
diff --git a/wp-includes/sqlite/class-wp-sqlite-lexer.php b/wp-includes/sqlite/class-wp-sqlite-lexer.php
@@ -2260,7 +2260,7 @@ public function parse_symbol() {
 			if ( null === $str ) {
 				$str = $this->parse_unknown();
 
-				if ( null === $str ) {
+				if ( null === $str && ! ( $flags & WP_SQLite_Token::FLAG_SYMBOL_PARAMETER ) ) {
 					$this->error( 'Variable name was expected.', $this->str[ $this->last ], $this->last );
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -2260,7 +2260,7 @@ public function parse_symbol() {`
`2260`	`2260`	`if ( null === $str ) {`
`2261`	`2261`	`$str = $this->parse_unknown();`
`2262`	`2262`
`2263`		`- if ( null === $str ) {`
	`2263`	`+ if ( null === $str && ! ( $flags & WP_SQLite_Token::FLAG_SYMBOL_PARAMETER ) ) {`
`2264`	`2264`	`$this->error( 'Variable name was expected.', $this->str[ $this->last ], $this->last );`
`2265`	`2265`	`}`
`2266`	`2266`	`}`