Changeset 30699 for trunk/src/wp-includes/wp-db.php

Timestamp:

12/02/2014 02:59:36 AM (10 years ago)

Author:

pento

Message:

WPDB: When looking up the character set for a table or column, make sure we send the table name to MySQL in the correct case, as MySQL can be configured with case sensitive table names.

Fixes #30538.

File:

• trunk/src/wp-includes/wp-db.php (modified) (8 diffs)

trunk/src/wp-includes/wp-db.php

@@ -2165 +2165 @@
      */
     protected function get_table_charset( $table ) {
-        $table = strtolower( $table );
+        $tablekey = strtolower( $table );
 
         /**
@@ -2183 +2183 @@
         }
 
-        if ( isset( $this->table_charset[ $table ] ) ) {
-            return $this->table_charset[ $table ];
+        if ( isset( $this->table_charset[ $tablekey ] ) ) {
+            return $this->table_charset[ $tablekey ];
         }
 
@@ -2197 +2197 @@
         }
 
-        $this->col_meta[ $table ] = $columns;
+        $this->col_meta[ $tablekey ] = $columns;
 
         foreach ( $columns as $column ) {
@@ -2209 +2209 @@
             // A binary/blob means the whole query gets treated like this.
             if ( in_array( strtoupper( $type ), array( 'BINARY', 'VARBINARY', 'TINYBLOB', 'MEDIUMBLOB', 'BLOB', 'LONGBLOB' ) ) ) {
-                $this->table_charset[ $table ] = 'binary';
+                $this->table_charset[ $tablekey ] = 'binary';
                 return 'binary';
             }
@@ -2243 +2243 @@
         }
 
-        $this->table_charset[ $table ] = $charset;
+        $this->table_charset[ $tablekey ] = $charset;
         return $charset;
     }
@@ -2259 +2259 @@
      */
     protected function get_col_charset( $table, $column ) {
-        $table = strtolower( $table );
-        $column = strtolower( $column );
+        $tablekey = strtolower( $table );
+        $columnkey = strtolower( $column );
 
         /**
@@ -2284 +2284 @@
         }
 
-        if ( empty( $this->table_charset[ $table ] ) ) {
+        if ( empty( $this->table_charset[ $tablekey ] ) ) {
             // This primes column information for us.
             $table_charset = $this->get_table_charset( $table );
@@ -2293 +2293 @@
 
         // If still no column information, return the table charset.
-        if ( empty( $this->col_meta[ $table ] ) ) {
-            return $this->table_charset[ $table ];
+        if ( empty( $this->col_meta[ $tablekey ] ) ) {
+            return $this->table_charset[ $tablekey ];
         }
 
         // If this column doesn't exist, return the table charset.
-        if ( empty( $this->col_meta[ $table ][ $column ] ) ) {
-            return $this->table_charset[ $table ];
+        if ( empty( $this->col_meta[ $tablekey ][ $columnkey ] ) ) {
+            return $this->table_charset[ $tablekey ];
         }
 
         // Return false when it's not a string column.
-        if ( empty( $this->col_meta[ $table ][ $column ]->Collation ) ) {
+        if ( empty( $this->col_meta[ $tablekey ][ $columnkey ]->Collation ) ) {
             return false;
         }
 
-        list( $charset ) = explode( '_', $this->col_meta[ $table ][ $column ]->Collation );
+        list( $charset ) = explode( '_', $this->col_meta[ $tablekey ][ $columnkey ]->Collation );
         return $charset;
     }