From bde2a220d9a3e45e67c47d2dcd6580a05cd6914d Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 13 Feb 2015 11:22:38 +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. git-svn-id: https://develop.svn.wordpress.org/trunk@31447 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/translation-install.php | 4 ++-- src/wp-includes/l10n.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wp-admin/includes/translation-install.php b/src/wp-admin/includes/translation-install.php index 66eb77ff56..25358f448f 100644 --- a/src/wp-admin/includes/translation-install.php +++ b/src/wp-admin/includes/translation-install.php @@ -141,7 +141,7 @@ function wp_install_language_form( $languages ) { $language = $languages[ $wp_local_package ]; printf( '' . "\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( '' . "\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/src/wp-includes/l10n.php b/src/wp-includes/l10n.php index fc2be882dc..4c5d8b19a5 100644 --- a/src/wp-includes/l10n.php +++ b/src/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( '', 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'] ) );