Changeset 29016

Timestamp:

07/07/2014 06:05:13 PM (11 years ago)

Author:

johnbillion

Message:

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.

File:

• trunk/src/wp-admin/includes/upgrade.php (modified) (3 diffs)

trunk/src/wp-admin/includes/upgrade.php

@@ -2211 +2211 @@
 }
 
-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.
     $available_languages = get_available_languages();
-    if ( in_array( $language->language, $available_languages ) ) {
-        return $language->language;
+    if ( in_array( $lang, $available_languages ) ) {
+        return $lang;
     }
 
@@ -2223 +2229 @@
     if ( $body ) {
         foreach ( $body['languages'] as $language ) {
-            if ( $language['language'] === $_REQUEST['language'] ) {
-                $loading_language = $_REQUEST['language'];
+            if ( $language['language'] === $lang ) {
+                $loading_language = $lang;
                 break;
             }
@@ -2238 +2244 @@
     $skin = new Automatic_Upgrader_Skin;
     $upgrader = new Language_Pack_Upgrader( $skin );
-    $options = array( 'clear_update_cache' => false );
     $language->type = 'core';
     /**