Changeset 3395

Timestamp:

06/17/2016 07:39:38 AM (8 years ago)

Author:

obenland

Message:

Plugin Directory: Properly encode display names.

H/t ocean90.

See #1719.

Location:

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

Files:

• plugins/plugin-directory/class-template.php (modified) (1 diff)
• plugins/plugin-directory/shortcodes/class-developers.php (modified) (2 diffs)
• themes/pub/wporg-plugins/template-parts/plugin-single.php (modified) (1 diff)

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

@@ -415 +415 @@
         }
     }
+
+    /**
+     * Properly encodes a string to UTF-8.
+     *
+     * @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/shortcodes/class-developers.php

@@ -1 +1 @@
 <?php
 namespace WordPressdotorg\Plugin_Directory\Shortcodes;
+use WordPressdotorg\Plugin_Directory\Template;
 use WordPressdotorg\Plugin_Directory\Tools;
 
@@ -27 +28 @@
             }
 
-            $output .= '<li>' . get_avatar( $contributor->ID, 32 ) . utf8_encode( $contributor->display_name ) . '</li>';
+            $output .= '<li>' . get_avatar( $contributor->ID, 32 ) . Template::encode( $contributor->display_name ) . '</li>';
         }
         $output .= '</ul>';

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-single.php

@@ -39 +39 @@
         <?php the_title( '<h1 class="plugin-title">', '</h1>' ); ?>
 
-        <span class="byline"><?php printf( esc_html_x( 'By %s', 'post author', 'wporg-plugins' ), '<span class="author vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '">' . esc_html( utf8_encode( get_the_author() ) ) . '</a></span>' ); ?></span>
+        <span class="byline"><?php printf( esc_html_x( 'By %s', 'post author', 'wporg-plugins' ), '<span class="author vcard"><a class="url fn n" href="' . esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ) . '">' . esc_html( Template::encode( get_the_author() ) ) . '</a></span>' ); ?></span>
     </header><!-- .entry-header -->