Changeset 38809

Timestamp:

10/17/2016 11:53:20 PM (8 years ago)

Author:

pento

Message:

Charset: Allow _canonical_charset() to handle mixed-case strings.

Add improved unit tests, and collect existing unit tests together.

Props pbearne.
Fixes #38337.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (2 diffs)
• tests/phpunit/tests/functions/canonical-charset.php (added)

trunk/src/wp-includes/functions.php

@@ -556 +556 @@
 
     //TODO: Tidy this ghetto code up and make the debug code optional
-    include_once( ABSPATH . WPINC . '/class-IXR.php' ); 
+    include_once( ABSPATH . WPINC . '/class-IXR.php' );
 
     $post_links = array();
@@ -5251 +5251 @@
  */
 function _canonical_charset( $charset ) {
-    if ( 'UTF-8' === $charset || 'utf-8' === $charset || 'utf8' === $charset ||
-        'UTF8' === $charset )
+    if ( 'utf-8' === strtolower( $charset ) || 'utf8' === strtolower( $charset) ) {
+
         return 'UTF-8';
-
-    if ( 'ISO-8859-1' === $charset || 'iso-8859-1' === $charset ||
-        'iso8859-1' === $charset || 'ISO8859-1' === $charset )
+    }
+
+    if ( 'iso-8859-1' === strtolower( $charset ) || 'iso8859-1' === strtolower( $charset ) ) {
+
         return 'ISO-8859-1';
+    }
 
     return $charset;