Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Role/Capability: Introduce capabilities dedicated to installing and updating language files. 

The new meta capabilities are called `install_languages` and `update_languages`. Prior to this change, there were no proper capability checks applied. Instead only the filesystem and related constants were checked, and for actual permissions a rather vague fallback was used where a user needed to have at least one of the other updating capabilities. In addition to being generally more verbose, the new capabilities make it possible for example to allow a user to update languages, but nothing else. By default they fall back to the original way of how they were handled.

Props johnbillion, flixos90.
Fixes #39677.

Built from https://develop.svn.wordpress.org/trunk@41268


git-svn-id: http://core.svn.wordpress.org/trunk@41108 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Felix Arntz 2017-08-18 18:31:44 +00:00
parent c14e0a0527
commit f6ebc1a80c
9 changed files with 65 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wp-admin/menu.php
View File

@ -33,12 +33,15 @@ if ( ! is_multisite() || current_user_can( 'update_core' ) ) {
}
if ( ! is_multisite() ) {
if ( current_user_can( 'update_core' ) )
if ( current_user_can( 'update_core' ) ) {
$cap = 'update_core';
elseif ( current_user_can( 'update_plugins' ) )
} elseif ( current_user_can( 'update_plugins' ) ) {
$cap = 'update_plugins';
else
} elseif ( current_user_can( 'update_themes' ) ) {
$cap = 'update_themes';
} else {
$cap = 'update_languages';
}
$submenu[ 'index.php' ][10] = array( sprintf( __('Updates %s'), "<span class='update-plugins count-{$update_data['counts']['total']}'><span class='update-count'>" . number_format_i18n($update_data['counts']['total']) . "</span></span>" ), $cap, 'update-core.php');
unset( $cap );
}

4
wp-admin/network/settings.php
View File

@ -63,7 +63,7 @@ if ( $_POST ) {
);
// Handle translation install.
if ( ! empty( $_POST['WPLANG'] ) && wp_can_install_language_pack() ) { // @todo: Skip if already installed
if ( ! empty( $_POST['WPLANG'] ) && current_user_can( 'install_languages' ) ) {
$language = wp_download_language_pack( $_POST['WPLANG'] );
if ( $language ) {
$_POST['WPLANG'] = $language;
@ -342,7 +342,7 @@ if ( isset( $_GET['updated'] ) ) {
'selected' => $lang,
'languages' => $languages,
'translations' => $translations,
'show_available_translations' => wp_can_install_language_pack(),
'show_available_translations' => current_user_can( 'install_languages' ),
) );
?>
</td>

6
wp-admin/network/site-new.php
View File

@ -66,7 +66,9 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
if ( isset( $_POST['WPLANG'] ) ) {
if ( '' === $_POST['WPLANG'] ) {
$meta['WPLANG'] = ''; // en_US
} elseif ( wp_can_install_language_pack() ) {
} elseif ( in_array( $_POST['WPLANG'], get_available_languages() ) ) {
$meta['WPLANG'] = $_POST['WPLANG'];
} elseif ( current_user_can( 'install_languages' ) ) {
$language = wp_download_language_pack( wp_unslash( $_POST['WPLANG'] ) );
if ( $language ) {
$meta['WPLANG'] = $language;
@ -234,7 +236,7 @@ if ( ! empty( $messages ) ) {
'selected' => $lang,
'languages' => $languages,
'translations' => $translations,
'show_available_translations' => wp_can_install_language_pack(),
'show_available_translations' => current_user_can( 'install_languages' ),
) );
?>
</td>

2
wp-admin/options-general.php
View File

@ -151,7 +151,7 @@ if ( ! empty( $languages ) || ! empty( $translations ) ) {
'selected' => $locale,
'languages' => $languages,
'translations' => $translations,
'show_available_translations' => ( ! is_multisite() || is_super_admin() ) && wp_can_install_language_pack(),
'show_available_translations' => current_user_can( 'install_languages' ),
) );
// Add note about deprecated WPLANG constant.

10
wp-admin/options.php
View File

@ -177,14 +177,12 @@ if ( 'update' == $action ) {
}
// Handle translation install.
if ( ! empty( $_POST['WPLANG'] ) && ( ! is_multisite() || is_super_admin() ) ) { // @todo: Skip if already installed
if ( ! empty( $_POST['WPLANG'] ) && current_user_can( 'install_languages' ) ) {
require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
if ( wp_can_install_language_pack() ) {
$language = wp_download_language_pack( $_POST['WPLANG'] );
if ( $language ) {
$_POST['WPLANG'] = $language;
}
$language = wp_download_language_pack( $_POST['WPLANG'] );
if ( $language ) {
$_POST['WPLANG'] = $language;
}
}
}

18
wp-admin/update-core.php
View File

@ -19,7 +19,7 @@ if ( is_multisite() && ! is_network_admin() ) {
exit();
}
if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes' ) && ! current_user_can( 'update_plugins' ) )
if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes' ) && ! current_user_can( 'update_plugins' ) && ! current_user_can( 'update_languages' ) )
wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
/**
@ -608,15 +608,19 @@ if ( 'upgrade-core' == $action ) {
echo ' &nbsp; <a class="button" href="' . esc_url( self_admin_url('update-core.php?force-check=1') ) . '">' . __( 'Check Again' ) . '</a>';
echo '</p>';
if ( $core = current_user_can( 'update_core' ) )
if ( current_user_can( 'update_core' ) ) {
core_upgrade_preamble();
if ( $plugins = current_user_can( 'update_plugins' ) )
}
if ( current_user_can( 'update_plugins' ) ) {
list_plugin_updates();
if ( $themes = current_user_can( 'update_themes' ) )
}
if ( current_user_can( 'update_themes' ) ) {
list_theme_updates();
if ( $core || $plugins || $themes )
}
if ( current_user_can( 'update_languages' ) ) {
list_translation_updates();
unset( $core, $plugins, $themes );
}
/**
* Fires after the core, plugin, and theme update tables.
*
@ -729,7 +733,7 @@ if ( 'upgrade-core' == $action ) {
} elseif ( 'do-translation-upgrade' == $action ) {
if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_plugins' ) && ! current_user_can( 'update_themes' ) )
if ( ! current_user_can( 'update_languages' ) )
wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
check_admin_referer( 'upgrade-translations' );

33
wp-includes/capabilities.php
View File

@ -392,6 +392,20 @@ function map_meta_cap( $cap, $user_id ) {
$caps[] = $cap;
}
break;
case 'install_languages':
case 'update_languages':
if ( ! function_exists( 'wp_can_install_language_pack' ) ) {
require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
}
if ( ! wp_can_install_language_pack() ) {
$caps[] = 'do_not_allow';
} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
$caps[] = 'do_not_allow';
} else {
$caps[] = 'install_languages';
}
break;
case 'activate_plugins':
$caps[] = $cap;
if ( is_multisite() ) {
@ -826,3 +840,22 @@ function revoke_super_admin( $user_id ) {
}
return false;
}
/**
* Filters the user capabilities to grant the 'install_languages' capability as necessary.
*
* A user must have at least one out of the 'update_core', 'install_plugins', and
* 'install_themes' capabilities to qualify for 'install_languages'.
*
* @since 4.9.0
*
* @param array $allcaps An array of all the user's capabilities.
* @return array Filtered array of the user's capabilities.
*/
function wp_maybe_grant_install_languages_cap( $allcaps ) {
if ( ! empty( $allcaps['update_core'] ) || ! empty( $allcaps['install_plugins'] ) || ! empty( $allcaps['install_themes'] ) ) {
$allcaps['install_languages'] = true;
}
return $allcaps;
}

3
wp-includes/default-filters.php
View File

@ -512,4 +512,7 @@ add_filter( 'oembed_dataparse', 'wp_filter_oembed_result', 10, 3 );
add_filter( 'oembed_response_data', 'get_oembed_response_data_rich', 10, 4 );
add_filter( 'pre_oembed_result', 'wp_filter_pre_oembed_result', 10, 3 );
// Capabilities
add_filter( 'user_has_cap', 'wp_maybe_grant_install_languages_cap', 1 );
unset( $filter, $action );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.9-alpha-41267';
$wp_version = '4.9-alpha-41268';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.