Changeset 31447

Timestamp:

02/13/2015 11:22:38 AM (10 years ago)

Author:

SergeyBiryukov

Message:

Avoid a PHP notice in wp_install_language_form() and wp_dropdown_languages() if the language doesn't have a ISO 639-1 code.

props barrykooij.
fixes #31319.

Location:

trunk/src

Files:

• wp-admin/includes/translation-install.php (modified) (2 diffs)
• wp-includes/l10n.php (modified) (2 diffs)

trunk/src/wp-admin/includes/translation-install.php

@@ -142 +142 @@
             printf( '<option value="%s" lang="%s" data-continue="%s"%s>%s</option>' . "\n",
                 esc_attr( $language['language'] ),
-                esc_attr( $language['iso'][1] ),
+                esc_attr( current( $language['iso'] ) ),
                 esc_attr( $language['strings']['continue'] ),
                 in_array( $language['language'], $installed_languages ) ? ' data-installed="1"' : '',
@@ -154 +154 @@
         printf( '<option value="%s" lang="%s" data-continue="%s"%s>%s</option>' . "\n",
             esc_attr( $language['language'] ),
-            esc_attr( $language['iso'][1] ),
+            esc_attr( current( $language['iso'] ) ),
             esc_attr( $language['strings']['continue'] ),
             in_array( $language['language'], $installed_languages ) ? ' data-installed="1"' : '',

trunk/src/wp-includes/l10n.php

@@ -897 +897 @@
                 'language'    => $translation['language'],
                 'native_name' => $translation['native_name'],
-                'lang'        => $translation['iso'][1],
+                'lang'        => current( $translation['iso'] ),
             );
 
@@ -943 +943 @@
                 '<option value="%s" lang="%s"%s>%s</option>',
                 esc_attr( $translation['language'] ),
-                esc_attr( $translation['iso'][1] ),
+                esc_attr( current( $translation['iso'] ) ),
                 selected( $translation['language'], $args['selected'], false ),
                 esc_html( $translation['native_name'] )