Changeset 42607 for branches/4.9/src/wp-admin/network/site-new.php

Timestamp:

01/24/2018 10:58:22 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Role/Capability: Make install_languages capability check less restrictive.

A user should still be able to have the capability, even when language packs cannot be automatically installed. The automatic installation part is separate from that now.

Props flixos90.
Merges [42606] to the 4.9 branch.
Fixes #42697.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/network/site-new.php (modified) (2 diffs)

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

@@ -69 +69 @@
         } 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 ) {
@@ -231 +231 @@
                     }
 
-                    wp_dropdown_languages( array(
-                        'name'                        => 'WPLANG',
-                        'id'                          => 'site-language',
-                        'selected'                    => $lang,
-                        'languages'                   => $languages,
-                        'translations'                => $translations,
-                        'show_available_translations' => current_user_can( 'install_languages' ),
-                    ) );
+                    wp_dropdown_languages(
+                        array(
+                            'name'                        => 'WPLANG',
+                            'id'                          => 'site-language',
+                            'selected'                    => $lang,
+                            'languages'                   => $languages,
+                            'translations'                => $translations,
+                            'show_available_translations' => current_user_can( 'install_languages' ) && wp_can_install_language_pack(),
+                        )
+                    );
                     ?>
                 </td>