Changeset 2202 for sites/trunk/api.wordpress.org/public_html/core/credits/wp-credits.php

Timestamp:

12/17/2015 11:17:16 PM (11 years ago)

Author:

ocean90

Message:

Credits API: Don't remove accents from display names, encode them instead.

Fixes #1478.

File:

• sites/trunk/api.wordpress.org/public_html/core/credits/wp-credits.php (modified) (4 diffs)

sites/trunk/api.wordpress.org/public_html/core/credits/wp-credits.php

@@ -168 +168 @@
                                 continue;
                         if ( $user->display_name && $user->display_name != $user->user_nicename && false === strpos( $user->display_name , '?') )
-                                $translators[ $user->user_nicename ] = remove_accents( $user->display_name );
+                                $translators[ $user->user_nicename ] = $this->_encode( $user->display_name );
                         else
                                 $translators[ $user->user_nicename ] = $user->user_nicename;
@@ -191 +191 @@
                                 continue;
                         if ( $user->display_name && $user->display_name != $user->user_nicename && false === strpos( $user->display_name , '?') )
-                                $validators[ $user->user_nicename ] = array( remove_accents( $user->display_name ), md5( $user->user_email ), $user->user_nicename );
+                                $validators[ $user->user_nicename ] = array( $this->_encode( $user->display_name ), md5( $user->user_email ), $user->user_nicename );
                         else
                                 $validators[ $user->user_nicename ] = array( $user->user_nicename, md5( $user->user_email ), $user->user_nicename );
@@ -328 +328 @@
                 foreach ( $user_data as $user ) {
                         if ( $user->display_name && $user->display_name != $user->user_nicename && false === strpos( $user->display_name , '?') )
-                                $props[ $user->user_nicename ] = remove_accents( $user->display_name );
+                                $props[ $user->user_nicename ] = $this->_encode( $user->display_name );
                         else
                                 $props[ $user->user_nicename ] = $user->user_nicename;
@@ -338 +338 @@
 
                 return $props;
+        }
+
+        private function _encode( $raw ) {
+                $raw = mb_convert_encoding( $raw, 'UTF-8', 'ASCII, JIS, UTF-8, Windows-1252, ISO-8859-1' );
+                return ent2ncr( htmlspecialchars_decode( htmlentities( $raw, ENT_NOQUOTES, 'UTF-8' ), ENT_NOQUOTES ) );
         }