From 1cda7b966713539cbe1d49f96293c99cd3da2c8d Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 24 Jan 2018 22:42:30 +0000
Subject: [PATCH] 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.
Fixes #42697.
Built from https://develop.svn.wordpress.org/trunk@42606


git-svn-id: http://core.svn.wordpress.org/trunk@42435 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/network/settings.php |  4 ++--
 wp-admin/network/site-new.php |  4 ++--
 wp-admin/options-general.php  |  2 +-
 wp-admin/options.php          |  8 +++++---
 wp-includes/capabilities.php  | 10 +---------
 wp-includes/version.php       |  2 +-
 6 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/wp-admin/network/settings.php b/wp-admin/network/settings.php
index 0bf31f4e02..27b83791dd 100644
--- a/wp-admin/network/settings.php
+++ b/wp-admin/network/settings.php
@@ -109,7 +109,7 @@ if ( $_POST ) {
 	);
 
 	// 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,7 +419,7 @@ if ( isset( $_GET['updated'] ) ) {
 								'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(),
 							)
 						);
 						?>
diff --git a/wp-admin/network/site-new.php b/wp-admin/network/site-new.php
index 318da58478..bc4809e005 100644
--- a/wp-admin/network/site-new.php
+++ b/wp-admin/network/site-new.php
@@ -73,7 +73,7 @@ if ( isset( $_REQUEST['action'] ) && 'add-site' == $_REQUEST['action'] ) {
 			$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,7 +259,7 @@ if ( ! empty( $messages ) ) {
 							'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(),
 						)
 					);
 					?>
diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index 6b8fbb1eed..a98634052a 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -177,7 +177,7 @@ if ( ! empty( $languages ) || ! empty( $translations ) ) {
 					'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(),
 				)
 			);
 
diff --git a/wp-admin/options.php b/wp-admin/options.php
index b2ecfc816e..5c13fd5e26 100644
--- a/wp-admin/options.php
+++ b/wp-admin/options.php
@@ -187,9 +187,11 @@ if ( 'update' == $action ) {
 		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;
+				}
 			}
 		}
 	}
diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index 39d76226f7..6b1a67295a 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -439,15 +439,7 @@ function map_meta_cap( $cap, $user_id ) {
 			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';
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3298d892ff..cb7d1be681 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.0-alpha-42604';
+$wp_version = '5.0-alpha-42606';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.