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

Upgrade/Install: After [40394], rename `wp_disallow_file_mods()` to `wp_is_file_mod_allowed()`. 

This makes it more clear what this function is about.

Props Mte90.
Fixes #38673.

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


git-svn-id: http://core.svn.wordpress.org/trunk@40499 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Pascal Birchler 2017-05-11 19:24:41 +00:00
parent 77858f4b92
commit 33047ba14e
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/class-wp-automatic-updater.php
View File

@ -31,7 +31,7 @@ class WP_Automatic_Updater {
*/
public function is_disabled() {
// Background updates are disabled if you don't want file changes.
if ( wp_disallow_file_mods( 'automatic_updater' ) )
if ( ! wp_is_file_mod_allowed( 'automatic_updater' ) )
return true;
if ( wp_installing() )

4
wp-admin/includes/translation-install.php
View File

@ -202,7 +202,7 @@ function wp_download_language_pack( $download ) {
return $download;
}
if ( wp_disallow_file_mods( 'download_language_pack' ) ) {
if ( ! wp_is_file_mod_allowed( 'download_language_pack' ) ) {
return false;
}
@ -245,7 +245,7 @@ function wp_download_language_pack( $download ) {
* @return bool Returns true on success, false on failure.
*/
function wp_can_install_language_pack() {
if ( wp_disallow_file_mods( 'can_install_language_pack' ) ) {
if ( ! wp_is_file_mod_allowed( 'can_install_language_pack' ) ) {
return false;
}

4
wp-includes/capabilities.php
View File

@ -362,7 +362,7 @@ function map_meta_cap( $cap, $user_id ) {
// Disallow the file editors.
if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
$caps[] = 'do_not_allow';
elseif ( wp_disallow_file_mods( 'capability_edit_themes' ) )
elseif ( ! wp_is_file_mod_allowed( 'capability_edit_themes' ) )
$caps[] = 'do_not_allow';
elseif ( is_multisite() && ! is_super_admin( $user_id ) )
$caps[] = 'do_not_allow';
@ -380,7 +380,7 @@ function map_meta_cap( $cap, $user_id ) {
case 'update_core':
// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
// Files in uploads are excepted.
if ( wp_disallow_file_mods( 'capability_update_core' ) ) {
if ( ! wp_is_file_mod_allowed( 'capability_update_core' ) ) {
$caps[] = 'do_not_allow';
} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
$caps[] = 'do_not_allow';

8
wp-includes/load.php
View File

@ -1099,14 +1099,14 @@ function is_wp_error( $thing ) {
* @param string $context The usage context.
* @return bool True if file modification is disallowed, false otherwise.
*/
function wp_disallow_file_mods( $context ) {
function wp_is_file_mod_allowed( $context ) {
/**
* Filters whether file modifications are disallowed.
*
* @since 4.8.0
*
* @param bool $disllow_file_mods Whether file modifications are disallowed.
* @param string $context The usage context.
* @param bool $disallow_file_mods Whether file modifications are disallowed.
* @param string $context The usage context.
*/
return apply_filters( 'disallow_file_mods' , defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS, $context );
return apply_filters( 'disallow_file_mods', defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS, $context );
}

2
wp-includes/version.php
View File

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