Changeset 33997 for branches/3.7/src/wp-includes/wp-db.php

Timestamp:

09/10/2015 07:19:11 AM (11 years ago)

Author:

pento

Message:

WPDB: get_table_from_query() didn't find table names with hyphens in them.

Merge of [33718] to the 3.8 branch.

Props dustinbolton, pento.

See #33470.

File:

• branches/3.7/src/wp-includes/wp-db.php (modified) (3 diffs)

branches/3.7/src/wp-includes/wp-db.php

@@ -2401 +2401 @@
                                 . '|UPDATE(?:\s+LOW_PRIORITY)?(?:\s+IGNORE)?'
                                 . '|DELETE(?:\s+LOW_PRIORITY|\s+QUICK|\s+IGNORE)*(?:\s+FROM)?'
-                                . ')\s+((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)/is', $query, $maybe ) ) {
+                                . ')\s+((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)/is', $query, $maybe ) ) {
                         return str_replace( '`', '', $maybe[1] );
                 }
@@ -2409 +2409 @@
                                 . 'SHOW\s+TABLE\s+STATUS.+(?:LIKE\s+|WHERE\s+Name\s*=\s*)'
                                 . '|SHOW\s+(?:FULL\s+)?TABLES.+(?:LIKE\s+|WHERE\s+Name\s*=\s*)'
-                                . ')\W((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)\W/is', $query, $maybe ) ) {
+                                . ')\W((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)\W/is', $query, $maybe ) ) {
                         return str_replace( '`', '', $maybe[1] );
                 }
@@ -2428 +2428 @@
                                 . '|(?:GRANT|REVOKE).*ON\s+TABLE'
                                 . '|SHOW\s+(?:.*FROM|.*TABLE)'
-                                . ')\s+\(*\s*((?:[0-9a-zA-Z$_.`]|[\xC2-\xDF][\x80-\xBF])+)\s*\)*/is', $query, $maybe ) ) {
+                                . ')\s+\(*\s*((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)\s*\)*/is', $query, $maybe ) ) {
                         return str_replace( '`', '', $maybe[1] );
                 }