Ticket #40829: 40829.diff

src/wp-includes/l10n.php

@@ -1116 +1116 @@
  * @param string|array $args {
  *     Optional. Array or string of arguments for outputting the language selector.
  *
- *     @type string   $id                           ID attribute of the select element. Default empty.
- *     @type string   $name                         Name attribute of the select element. Default empty.
+ *     @type string   $id                           ID attribute of the select element. Default 'locale'.
+ *     @type string   $name                         Name attribute of the select element. Default 'locale'.
  *     @type array    $languages                    List of installed languages, contain only the locales.
  *                                                  Default empty array.
  *     @type array    $translations                 List of available translations. Default result of
@@ -1132 +1132 @@
  */
 function wp_dropdown_languages( $args = array() ) {
 
-        $args = wp_parse_args( $args, array(
-                'id'           => '',
-                'name'         => '',
+        $r = wp_parse_args( $args, array(
+                'id'           => 'locale',
+                'name'         => 'locale',
                 'languages'    => array(),
                 'translations' => array(),
                 'selected'     => '',
@@ -1143 +1143 @@
                 'show_option_site_default'    => false,
         ) );
 
-        // English (United States) uses an empty string for the value attribute.
-        if ( 'en_US' === $args['selected'] ) {
-                $args['selected'] = '';
+        // Bail if no ID or no name.
+        if ( empty( $r['id'] ) || empty( $r['name'] ) ) {
+                return;
         }
 
-        $translations = $args['translations'];
+        // English (United States) uses an empty string for the value attribute.
+        if ( 'en_US' === $r['selected'] ) {
+                $r['selected'] = '';
+        }
+
+        $translations = $r['translations'];
         if ( empty( $translations ) ) {
                 require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
                 $translations = wp_get_available_translations();
         }
 
         /*
-         * $args['languages'] should only contain the locales. Find the locale in
+         * $r['languages'] should only contain the locales. Find the locale in
          * $translations to get the native name. Fall back to locale.
          */
         $languages = array();
-        foreach ( $args['languages'] as $locale ) {
+        foreach ( $r['languages'] as $locale ) {
                 if ( isset( $translations[ $locale ] ) ) {
                         $translation = $translations[ $locale ];
                         $languages[] = array(
@@ -1179 +1184 @@
                 }
         }
 
-        $translations_available = ( ! empty( $translations ) && $args['show_available_translations'] );
-
-        $output = sprintf( '<select name="%s" id="%s">', esc_attr( $args['name'] ), esc_attr( $args['id'] ) );
+        $translations_available = ( ! empty( $translations ) && $r['show_available_translations'] );
 
         // Holds the HTML markup.
         $structure = array();
@@ -1191 +1194 @@
                 $structure[] = '<optgroup label="' . esc_attr_x( 'Installed', 'translations' ) . '">';
         }
 
-        if ( $args['show_option_site_default'] ) {
+        // Site default.
+        if ( $r['show_option_site_default'] ) {
                 $structure[] = sprintf(
                         '<option value="site-default" data-installed="1"%s>%s</option>',
-                        selected( 'site-default', $args['selected'], false ),
+                        selected( 'site-default', $r['selected'], false ),
                         _x( 'Site Default', 'default site language' )
                 );
         }
 
+        // Always show English.
         $structure[] = sprintf(
                 '<option value="" lang="en" data-installed="1"%s>English (United States)</option>',
-                selected( '', $args['selected'], false )
+                selected( '', $r['selected'], false )
         );
 
+        // List installed languages.
         foreach ( $languages as $language ) {
                 $structure[] = sprintf(
                         '<option value="%s" lang="%s"%s data-installed="1">%s</option>',
                         esc_attr( $language['language'] ),
                         esc_attr( $language['lang'] ),
-                        selected( $language['language'], $args['selected'], false ),
+                        selected( $language['language'], $r['selected'], false ),
                         esc_html( $language['native_name'] )
                 );
         }
+
         if ( $translations_available ) {
                 $structure[] = '</optgroup>';
-        }
 
-        // List available translations.
-        if ( $translations_available ) {
+                // List available translations.
                 $structure[] = '<optgroup label="' . esc_attr_x( 'Available', 'translations' ) . '">';
                 foreach ( $translations as $translation ) {
                         $structure[] = sprintf(
                                 '<option value="%s" lang="%s"%s>%s</option>',
                                 esc_attr( $translation['language'] ),
                                 esc_attr( current( $translation['iso'] ) ),
-                                selected( $translation['language'], $args['selected'], false ),
+                                selected( $translation['language'], $r['selected'], false ),
                                 esc_html( $translation['native_name'] )
                         );
                 }
                 $structure[] = '</optgroup>';
         }
 
+        // Combine the output string.
+        $output  = sprintf( '<select name="%s" id="%s">', esc_attr( $r['name'] ), esc_attr( $r['id'] ) );
         $output .= join( "\n", $structure );
-
         $output .= '</select>';
 
-        if ( $args['echo'] ) {
+        if ( $r['echo'] ) {
                 echo $output;
         }