From b8f3e8d59a89bf7371921dc06a4893d99b5366d7 Mon Sep 17 00:00:00 2001 From: Maxime Culea Date: Sun, 23 Apr 2017 10:43:07 +0200 Subject: [PATCH 1/2] #38673 : Change method usage name from "wp_disallow_file_mods" to "wp_is_file_mod_allowed" --- src/wp-admin/includes/class-wp-automatic-updater.php | 2 +- src/wp-admin/includes/dashboard.php | 2 +- src/wp-admin/includes/translation-install.php | 4 ++-- src/wp-includes/capabilities.php | 4 ++-- src/wp-includes/load.php | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/wp-admin/includes/class-wp-automatic-updater.php b/src/wp-admin/includes/class-wp-automatic-updater.php index 3922a0b..9321f2c 100644 --- a/src/wp-admin/includes/class-wp-automatic-updater.php +++ b/src/wp-admin/includes/class-wp-automatic-updater.php @@ -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() ) diff --git a/src/wp-admin/includes/dashboard.php b/src/wp-admin/includes/dashboard.php index b763d43..35bfa49 100644 --- a/src/wp-admin/includes/dashboard.php +++ b/src/wp-admin/includes/dashboard.php @@ -1152,7 +1152,7 @@ function wp_dashboard_primary() { ) ); - if ( ( ! wp_disallow_file_mods( 'dashboard_widget' ) ) && ( ! is_multisite() && is_blog_admin() && current_user_can( 'install_plugins' ) ) || ( is_network_admin() && current_user_can( 'manage_network_plugins' ) && current_user_can( 'install_plugins' ) ) ) { + if ( ( wp_is_file_mod_allowed( 'dashboard_widget' ) ) && ( ! is_multisite() && is_blog_admin() && current_user_can( 'install_plugins' ) ) || ( is_network_admin() && current_user_can( 'manage_network_plugins' ) && current_user_can( 'install_plugins' ) ) ) { $feeds['plugins'] = array( 'link' => '', 'url' => array( diff --git a/src/wp-admin/includes/translation-install.php b/src/wp-admin/includes/translation-install.php index e65ec27..5fd9816 100644 --- a/src/wp-admin/includes/translation-install.php +++ b/src/wp-admin/includes/translation-install.php @@ -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; } diff --git a/src/wp-includes/capabilities.php b/src/wp-includes/capabilities.php index abd8725..c903ff0 100644 --- a/src/wp-includes/capabilities.php +++ b/src/wp-includes/capabilities.php @@ -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'; diff --git a/src/wp-includes/load.php b/src/wp-includes/load.php index a8f730e..50d87bb 100644 --- a/src/wp-includes/load.php +++ b/src/wp-includes/load.php @@ -1081,7 +1081,7 @@ 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. * -- 2.9.0 From 32e32e307b9c08266358abb61bc618409450c977 Mon Sep 17 00:00:00 2001 From: Maxime Culea Date: Sun, 23 Apr 2017 10:43:44 +0200 Subject: [PATCH 2/2] #38673 : Some documentation and refactoring. --- src/wp-includes/load.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wp-includes/load.php b/src/wp-includes/load.php index 50d87bb..b593f88 100644 --- a/src/wp-includes/load.php +++ b/src/wp-includes/load.php @@ -1087,8 +1087,8 @@ function wp_is_file_mod_allowed( $context ) { * * @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.9.0