Ticket #38751: 38751.diff

trunk/wp-includes/wp-db.php

@@ -3037 +3037 @@
                         return str_replace( '`', '', $maybe[1] );
                 }
 
-                // SHOW TABLE STATUS and SHOW TABLES
-                if ( preg_match( '/^\s*(?:'
-                                . '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 ) ) {
-                        return str_replace( '`', '', $maybe[1] );
+                // SHOW TABLE STATUS and SHOW TABLES WHERE Name = 'wp_posts'
+                if ( preg_match( '/^\s*SHOW\s+(?:TABLE\s+STATUS|(?:FULL\s+)?TABLES).+WHERE\s+Name\s*=\s*("|\')((?:[0-9a-zA-Z$_.-]|[\xC2-\xDF][\x80-\xBF])+)\\1/is', $query, $maybe ) ) {
+                        return $maybe[2];
                 }
 
+                // SHOW TABLE STATUS LIKE and SHOW TABLES LIKE 'wp\_123\_%'
+                if ( preg_match( '/^\s*SHOW\s+(?:TABLE\s+STATUS|(?:FULL\s+)?TABLES)\s+(?:WHERE\s+Name\s+)?LIKE\s*("|\')((?:[\\\\0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)%?\\1/is', $query, $maybe ) ) {
+                        return str_replace( '\\_', '_', $maybe[2] );
+                }
+
                 // Big pattern for the rest of the table-related queries.
                 if ( preg_match( '/^\s*(?:'
                                 . '(?:EXPLAIN\s+(?:EXTENDED\s+)?)?SELECT.*?\s+FROM'