Changeset 37538 for trunk/src/wp-admin/includes/upgrade.php

Timestamp:

05/23/2016 06:11:32 PM (9 years ago)

Author:

ocean90

Message:

Database: Support backticks around field names when parsing a query for the field type.

Avoids an undefined index PHP warning by dbDelta().

Props davidmosterd, ocean90.
See #20263.

File:

• trunk/src/wp-admin/includes/upgrade.php (modified) (1 diff)

trunk/src/wp-admin/includes/upgrade.php

@@ -2222 +2222 @@
 
                 // Get the field type from the query.
-                preg_match("|".$tablefield->Field." ([^ ]*( unsigned)?)|i", $cfields[ $tablefield_field_lowercased ], $matches);
+                preg_match( '|`?' . $tablefield->Field . '`? ([^ ]*( unsigned)?)|i', $cfields[ $tablefield_field_lowercased ], $matches );
                 $fieldtype = $matches[1];
                 $fieldtype_lowercased = strtolower( $fieldtype );