Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-24 18:18:01 +01:00
Code Issues Projects Releases Wiki Activity

Correct the usage of the variable passed to wp_install_download_language_pack() and kill an unused local variable. Props michalzuber. Also avoid using the $_REQUEST superglobal in this function. See #28577.

Browse Source 
Built from https://develop.svn.wordpress.org/trunk@29016


git-svn-id: http://core.svn.wordpress.org/trunk@28804 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2014-07-07 18:06:15 +00:00
parent 9ef7c41a15
commit ea46c7423a
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wp-admin/includes/upgrade.php
View File

@ -2210,11 +2210,17 @@ function wp_get_available_translations() {
return false; return false;
} }
function wp_install_download_language_pack( $language ) { /**
* [wp_install_download_language_pack description]
*
* @param string $lang [description]
* @return string|false [description]
*/
function wp_install_download_language_pack( $lang ) {
// Check if the language is already installed. // Check if the language is already installed.
$available_languages = get_available_languages(); $available_languages = get_available_languages();
if ( in_array( $language->language, $available_languages ) ) { if ( in_array( $lang, $available_languages ) ) {
return $language->language; return $lang;
} }
// Confirm the language is one we can download. // Confirm the language is one we can download.
@ -2222,8 +2228,8 @@ function wp_install_download_language_pack( $language ) {
$loading_language = false; $loading_language = false;
if ( $body ) { if ( $body ) {
foreach ( $body['languages'] as $language ) { foreach ( $body['languages'] as $language ) {
if ( $language['language'] === $_REQUEST['language'] ) { if ( $language['language'] === $lang ) {
$loading_language = $_REQUEST['language']; $loading_language = $lang;
break; break;
} }
} }
@ -2237,7 +2243,6 @@ function wp_install_download_language_pack( $language ) {
require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php'; require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
$skin = new Automatic_Upgrader_Skin; $skin = new Automatic_Upgrader_Skin;
$upgrader = new Language_Pack_Upgrader( $skin ); $upgrader = new Language_Pack_Upgrader( $skin );
$options = array( 'clear_update_cache' => false );
$language->type = 'core'; $language->type = 'core';
/** /**
* @todo failures (such as non-direct FS) * @todo failures (such as non-direct FS)