Changeset 35655 for trunk/tests/phpunit/tests/db/charset.php

Timestamp:

11/17/2015 06:12:08 AM (10 years ago)

Author:

pento

Message:

WPDB: Fall back to the connection charset when sanity checking strings.

If DB_CHARSET isn't defined (or is empty), wpdb::$charset will be empty, too. wpdb::strip_invalid_text() assumes that it isn't empty, however, so we need to fall back to the connection character set when we're running our sanity checks.

Fixes #34708.

File:

• trunk/tests/phpunit/tests/db/charset.php (modified) (1 diff)

trunk/tests/phpunit/tests/db/charset.php

@@ -866 +866 @@
         $this->assertEquals( $safe_query, $stripped_query );
     }
+
+    /**
+     * @ticket 34708
+     */
+    function test_no_db_charset_defined() {
+        $tablename = 'test_cp1251_query_' . rand_str( 5 );
+        if ( ! self::$_wpdb->query( "CREATE TABLE $tablename ( a VARCHAR(50) ) DEFAULT CHARSET 'cp1251'" ) ) {
+            $this->markTestSkipped( "Test requires the 'cp1251' charset" );
+        }
+
+        $charset = self::$_wpdb->charset;
+        self::$_wpdb->charset = '';
+
+        $safe_query = "INSERT INTO $tablename( `a` ) VALUES( 'safe data' )";
+        $stripped_query = self::$_wpdb->strip_invalid_text_from_query( $safe_query );
+
+        self::$_wpdb->query( "DROP TABLE $tablename" );
+
+        self::$_wpdb->charset = $charset;
+
+        $this->assertEquals( $safe_query, $stripped_query );
+    }
 }