Changeset 41733

Timestamp:

10/04/2017 03:07:26 PM (7 years ago)

Author:

SergeyBiryukov

Message:

I18N: In wp_dropdown_languages(), change the parsed arguments variable to $parsed_args, to prevent stomping the original $args array.

Props Mte90.
See #40829.

File:

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

trunk/src/wp-includes/l10n.php

@@ -1134 +1134 @@
 function wp_dropdown_languages( $args = array() ) {
 
-    $args = wp_parse_args( $args, array(
+    $parsed_args = wp_parse_args( $args, array(
         'id'           => '',
         'name'         => '',
@@ -1146 +1146 @@
 
     // English (United States) uses an empty string for the value attribute.
-    if ( 'en_US' === $args['selected'] ) {
-        $args['selected'] = '';
-    }
-
-    $translations = $args['translations'];
+    if ( 'en_US' === $parsed_args['selected'] ) {
+        $parsed_args['selected'] = '';
+    }
+
+    $translations = $parsed_args['translations'];
     if ( empty( $translations ) ) {
         require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
@@ -1157 +1157 @@
 
     /*
-     * $args['languages'] should only contain the locales. Find the locale in
+     * $parsed_args['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 ( $parsed_args['languages'] as $locale ) {
         if ( isset( $translations[ $locale ] ) ) {
             $translation = $translations[ $locale ];
@@ -1181 +1181 @@
     }
 
-    $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 ) && $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.
@@ -1193 +1193 @@
     }
 
-    if ( $args['show_option_site_default'] ) {
+    if ( $parsed_args['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', $parsed_args['selected'], false ),
             _x( 'Site Default', 'default site language' )
         );
@@ -1203 +1203 @@
     $structure[] = sprintf(
         '<option value="" lang="en" data-installed="1"%s>English (United States)</option>',
-        selected( '', $args['selected'], false )
+        selected( '', $parsed_args['selected'], false )
     );
 
@@ -1211 +1211 @@
             esc_attr( $language['language'] ),
             esc_attr( $language['lang'] ),
-            selected( $language['language'], $args['selected'], false ),
+            selected( $language['language'], $parsed_args['selected'], false ),
             esc_html( $language['native_name'] )
         );
@@ -1227 +1227 @@
                 esc_attr( $translation['language'] ),
                 esc_attr( current( $translation['iso'] ) ),
-                selected( $translation['language'], $args['selected'], false ),
+                selected( $translation['language'], $parsed_args['selected'], false ),
                 esc_html( $translation['native_name'] )
             );
@@ -1238 +1238 @@
     $output .= '</select>';
 
-    if ( $args['echo'] ) {
+    if ( $parsed_args['echo'] ) {
         echo $output;
     }