Ticket #42697: 42697.diff

src/wp-admin/network/settings.php

@@ -109 +109 @@
         );
 
         // Handle translation installation.
-        if ( ! empty( $_POST['WPLANG'] ) && current_user_can( 'install_languages' ) ) {
+        if ( ! empty( $_POST['WPLANG'] ) && current_user_can( 'install_languages' ) && wp_can_install_language_pack() ) {
                 $language = wp_download_language_pack( $_POST['WPLANG'] );
                 if ( $language ) {
                         $_POST['WPLANG'] = $language;
@@ -419 +419 @@
                                                                 'selected'     => $lang,
                                                                 'languages'    => $languages,
                                                                 'translations' => $translations,
-                                                                'show_available_translations' => current_user_can( 'install_languages' ),
+                                                                'show_available_translations' => current_user_can( 'install_languages' ) && wp_can_install_language_pack(),
                                                         )
                                                 );
                                                 ?>

src/wp-admin/network/site-new.php

@@ -73 +73 @@
                         $meta['WPLANG'] = ''; // en_US
                 } elseif ( in_array( $_POST['WPLANG'], get_available_languages() ) ) {
                         $meta['WPLANG'] = $_POST['WPLANG'];
-                } elseif ( current_user_can( 'install_languages' ) ) {
+                } elseif ( current_user_can( 'install_languages' ) && wp_can_install_language_pack() ) {
                         $language = wp_download_language_pack( wp_unslash( $_POST['WPLANG'] ) );
                         if ( $language ) {
                                 $meta['WPLANG'] = $language;
@@ -259 +259 @@
                                                         'selected'                    => $lang,
                                                         'languages'                   => $languages,
                                                         'translations'                => $translations,
-                                                        'show_available_translations' => current_user_can( 'install_languages' ),
+                                                        'show_available_translations' => current_user_can( 'install_languages' ) && wp_can_install_language_pack(),
                                                 )
                                         );
                                         ?>

src/wp-admin/options-general.php

@@ -177 +177 @@
                                         'selected'                    => $locale,
                                         'languages'                   => $languages,
                                         'translations'                => $translations,
-                                        'show_available_translations' => current_user_can( 'install_languages' ),
+                                        'show_available_translations' => current_user_can( 'install_languages' ) && wp_can_install_language_pack(),
                                 )
                         );
 

src/wp-admin/options.php

@@ -187 +187 @@
                 if ( ! empty( $_POST['WPLANG'] ) && current_user_can( 'install_languages' ) ) {
                         require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
 
-                        $language = wp_download_language_pack( $_POST['WPLANG'] );
-                        if ( $language ) {
-                                $_POST['WPLANG'] = $language;
+                        if ( wp_can_install_language_pack() ) {
+                                $language = wp_download_language_pack( $_POST['WPLANG'] );
+                                if ( $language ) {
+                                        $_POST['WPLANG'] = $language;
+                                }
                         }
                 }
         }

src/wp-includes/capabilities.php

@@ -439 +439 @@
                         break;
                 case 'install_languages':
                 case 'update_languages':
-                        if ( ! function_exists( 'request_filesystem_credentials' ) ) {
-                                require_once( ABSPATH . 'wp-admin/includes/file.php' );
-                        }
-
-                        if ( ! function_exists( 'wp_can_install_language_pack' ) ) {
-                                require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
-                        }
-
-                        if ( ! wp_can_install_language_pack() ) {
+                        if ( ! wp_is_file_mod_allowed( 'can_install_language_pack' ) ) {
                                 $caps[] = 'do_not_allow';
                         } elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
                                 $caps[] = 'do_not_allow';