Changeset 41734

Timestamp:

10/04/2017 03:22:15 PM (7 years ago)

Author:

SergeyBiryukov

Message:

I18N: Make sure wp_dropdown_languages() does not print out empty name and id attributes.

Props johnjamesjacoby, afercia.
Fixes #40829.

File:

• trunk/src/wp-includes/l10n.php (modified) (8 diffs)

trunk/src/wp-includes/l10n.php

@@ -1118 +1118 @@
  *     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.
@@ -1135 +1135 @@
 
     $parsed_args = wp_parse_args( $args, array(
-        'id'           => '',
-        'name'         => '',
+        'id'           => 'locale',
+        'name'         => 'locale',
         'languages'    => array(),
         'translations' => array(),
@@ -1144 +1144 @@
         'show_option_site_default'    => false,
     ) );
+
+    // Bail if no ID or no name.
+    if ( ! $parsed_args['id'] || ! $parsed_args['name'] ) {
+        return;
+    }
 
     // English (United States) uses an empty string for the value attribute.
@@ -1183 +1188 @@
     $translations_available = ( ! empty( $translations ) && $parsed_args['show_available_translations'] );
 
-    $output = sprintf( '<select name="%s" id="%s">', esc_attr( $parsed_args['name'] ), esc_attr( $parsed_args['id'] ) );
-
     // Holds the HTML markup.
     $structure = array();
@@ -1193 +1196 @@
     }
 
+    // Site default.
     if ( $parsed_args['show_option_site_default'] ) {
         $structure[] = sprintf(
@@ -1201 +1205 @@
     }
 
+    // Always show English.
     $structure[] = sprintf(
         '<option value="" lang="en" data-installed="1"%s>English (United States)</option>',
@@ -1206 +1211 @@
     );
 
+    // List installed languages. 
     foreach ( $languages as $language ) {
         $structure[] = sprintf(
@@ -1234 +1240 @@
     }
 
+    // Combine the output string.
+    $output  = sprintf( '<select name="%s" id="%s">', esc_attr( $parsed_args['name'] ), esc_attr( $parsed_args['id'] ) );
     $output .= join( "\n", $structure );
-
     $output .= '</select>';