Changeset 14915

Timestamp:

05/25/2026 03:49:18 AM (3 months ago)

Author:

dd32

Message:

Plugin Directory: Remove user dispaly_name UTF8 workarounds.

These calls have not been required in some time, and are now causing problems with valid UTF-8 data when it's detected as JIS in newer PHP versions.
This was a workaround for a database charset issues.

Props dd32, TobiasBg.
Fixes #8254.

Location:

sites/trunk/wordpress.org/public_html/wp-content/plugins

Files:

• plugin-directory/class-template.php (modified) (1 diff)
• plugin-directory/widgets/class-committers.php (modified) (2 diffs)
• plugin-directory/widgets/class-contributors.php (modified) (2 diffs)
• plugin-directory/widgets/class-support-reps.php (modified) (2 diffs)
• wporg-gp-routes/inc/routes/class-locale.php (modified) (3 diffs)
• wporg-gp-routes/inc/routes/class-wp-directory.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-template.php

@@ -911 +911 @@
 
                 return $out;
-        }
-
-        /**
-         * Properly encodes a string to UTF-8.
-         *
-         * @static
-         *
-         * @param string $string
-         * @return string
-         */
-        public static function encode( $string ) {
-                $string = mb_convert_encoding( $string, 'UTF-8', 'ASCII, JIS, UTF-8, Windows-1252, ISO-8859-1' );
-
-                return ent2ncr( htmlspecialchars_decode( htmlentities( $string, ENT_NOQUOTES, 'UTF-8' ), ENT_NOQUOTES ) );
         }
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-committers.php

@@ -2 +2 @@
 namespace WordPressdotorg\Plugin_Directory\Widgets;
 
-use WordPressdotorg\Plugin_Directory\Template;
 use WordPressdotorg\Plugin_Directory\Tools;
 
@@ -57 +56 @@
                                         <?php echo get_avatar( $committer->ID, 32 ); ?>
                                         <a href="<?php echo esc_url( "https://profiles.wordpress.org/{$committer->user_nicename}/" ); ?>">
-                                                <?php echo Template::encode( $committer->display_name ?: $committer->user_nicename ); ?>
+                                                <?php echo $committer->display_name ?: $committer->user_nicename; ?>
                                         </a><br>
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-contributors.php

@@ -1 +1 @@
 <?php
 namespace WordPressdotorg\Plugin_Directory\Widgets;
-
-use WordPressdotorg\Plugin_Directory\Template;
 
 /**
@@ -74 +72 @@
                                 <?php echo get_avatar( $contributor->ID, 32 ); ?>
                                 <a href="<?php echo esc_url( "https://profiles.wordpress.org/{$contributor->user_nicename}/" ); ?>">
-                                        <?php echo Template::encode( $contributor->display_name ?: $contributor->user_nicename ); ?>
+                                        <?php echo $contributor->display_name ?: $contributor->user_nicename; ?>
                                 </a>
                         </li>

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-support-reps.php

@@ -2 +2 @@
 namespace WordPressdotorg\Plugin_Directory\Widgets;
 
-use WordPressdotorg\Plugin_Directory\Template;
 use WordPressdotorg\Plugin_Directory\Tools;
 
@@ -61 +60 @@
                                         <?php echo get_avatar( $support_rep->ID, 32 ); ?>
                                         <a href="<?php echo esc_url( "https://profiles.wordpress.org/{$support_rep->user_nicename}/" ); ?>">
-                                                <?php echo Template::encode( $support_rep->display_name ?: $support_rep->user_nicename ); ?>
+                                                <?php echo $support_rep->display_name ?: $support_rep->user_nicename; ?>
                                         </a><br>
 

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-locale.php

@@ -435 +435 @@
                                 $locale_contributors['editors'][ $editor_source ][ $editor_id ] = (object) array(
                                         'nicename'     => $user->user_nicename,
-                                        'display_name' => $this->_encode( $user->display_name ),
+                                        'display_name' => $user->display_name ?: $user->user_nicename,
                                         'email'        => $user->user_email,
                                 );
@@ -525 +525 @@
                                 'login'         => $user->user_login,
                                 'nicename'      => $user->user_nicename,
-                                'display_name'  => $this->_encode( $user->display_name ),
+                                'display_name'  => $user->display_name ?: $user->user_nicename,
                                 'email'         => $user->user_email,
                                 'last_update'   => $contributor->last_update,
@@ -1020 +1020 @@
                 " );
         }
-
-        private function _encode( $raw ) {
-                if ( 'UTF-8' !== mb_detect_encoding( $raw, 'UTF-8', true ) ) {
-                        $raw = mb_convert_encoding( $raw, 'UTF-8', 'ASCII, JIS, Windows-1252, ISO-8859-1' );
-                }
-                return ent2ncr( htmlspecialchars_decode( htmlentities( $raw, ENT_NOQUOTES, 'UTF-8' ), ENT_NOQUOTES ) );
-        }
 }

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-gp-routes/inc/routes/class-wp-directory.php

@@ -45 +45 @@
                         $contributors_by_locale[ $translation_editor->locale ]['editors'][ $translation_editor->user_id ] = (object) array(
                                 'nicename'     => $user->user_nicename,
-                                'display_name' => $this->_encode( $user->display_name ),
+                                'display_name' => $user->display_name ?: $user->user_nicename,
                         );
 
@@ -73 +73 @@
                         $contributors_by_locale[ $row->locale ]['contributors'][ $row->user_id ] = (object) array(
                                 'nicename'     => $user->user_nicename,
-                                'display_name' => $this->_encode( $user->display_name ),
+                                'display_name' => $user->display_name ?: $user->user_nicename,
                         );
 
@@ -106 +106 @@
                                 $contributors_by_locale[ $row->locale ]['contributors'][ $row->user_id ] = (object) array(
                                         'nicename'     => $user->user_nicename,
-                                        'display_name' => $this->_encode( $user->display_name ),
+                                        'display_name' => $user->display_name ?: $user->user_nicename,
                                 );
 
@@ -241 +241 @@
                 return $wpdb->get_results( $sql );
         }
-
-        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 ) );
-        }
 }