From e2f5a8094e39792fed674d384ce021c44906da73 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 13 Feb 2015 11:23:26 +0000
Subject: [PATCH] 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.
Built from https://develop.svn.wordpress.org/trunk@31447


git-svn-id: http://core.svn.wordpress.org/trunk@31428 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/translation-install.php | 4 ++--
 wp-includes/l10n.php                      | 4 ++--
 wp-includes/version.php                   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wp-admin/includes/translation-install.php b/wp-admin/includes/translation-install.php
index 66eb77ff56..25358f448f 100644
--- a/wp-admin/includes/translation-install.php
+++ b/wp-admin/includes/translation-install.php
@@ -141,7 +141,7 @@ function wp_install_language_form( $languages ) {
 			$language = $languages[ $wp_local_package ];
 			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"' : '',
 				esc_html( $language['native_name'] ) );
@@ -153,7 +153,7 @@ function wp_install_language_form( $languages ) {
 	foreach ( $languages as $language ) {
 		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"' : '',
 			esc_html( $language['native_name'] ) );
diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php
index fc2be882dc..4c5d8b19a5 100644
--- a/wp-includes/l10n.php
+++ b/wp-includes/l10n.php
@@ -896,7 +896,7 @@ function wp_dropdown_languages( $args = array() ) {
 			$languages[] = array(
 				'language'    => $translation['language'],
 				'native_name' => $translation['native_name'],
-				'lang'        => $translation['iso'][1],
+				'lang'        => current( $translation['iso'] ),
 			);
 
 			// Remove installed language from available translations.
@@ -942,7 +942,7 @@ function wp_dropdown_languages( $args = array() ) {
 			$structure[] = sprintf(
 				'<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'] )
 			);
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 066a75c118..01103d71be 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31446';
+$wp_version = '4.2-alpha-31447';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.