diff --git a/src/wp-includes/wp-db.php b/src/wp-includes/wp-db.php index 02577b910d..f4f0826897 100644 --- a/src/wp-includes/wp-db.php +++ b/src/wp-includes/wp-db.php @@ -3029,7 +3029,7 @@ class wpdb { . '|INSERT(?:\s+LOW_PRIORITY|\s+DELAYED|\s+HIGH_PRIORITY)?(?:\s+IGNORE)?(?:\s+INTO)?' . '|REPLACE(?:\s+LOW_PRIORITY|\s+DELAYED)?(?:\s+INTO)?' . '|UPDATE(?:\s+LOW_PRIORITY)?(?:\s+IGNORE)?' - . '|DELETE(?:\s+LOW_PRIORITY|\s+QUICK|\s+IGNORE)*(?:\s+FROM)?' + . '|DELETE(?:\s+LOW_PRIORITY|\s+QUICK|\s+IGNORE)*(?:.+?FROM)?' . ')\s+((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)/is', $query, $maybe ) ) { return str_replace( '`', '', $maybe[1] ); } diff --git a/tests/phpunit/tests/db.php b/tests/phpunit/tests/db.php index a876869346..7cff637149 100644 --- a/tests/phpunit/tests/db.php +++ b/tests/phpunit/tests/db.php @@ -562,6 +562,8 @@ class Tests_DB extends WP_UnitTestCase { "DELETE QUICK $table", "DELETE IGNORE $table", "DELETE LOW_PRIORITY FROM $table", + "DELETE a FROM $table a", + "DELETE `a` FROM $table a", // STATUS "SHOW TABLE STATUS LIKE '$table'",