Changeset 40638

Timestamp:

05/11/2017 07:23:45 PM (9 years ago)

Author:

swissspidy

Message:

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.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-automatic-updater.php (modified) (1 diff)
• wp-admin/includes/translation-install.php (modified) (2 diffs)
• wp-includes/capabilities.php (modified) (2 diffs)
• wp-includes/load.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-automatic-updater.php

@@ -32 +32 @@
         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;
 

trunk/src/wp-admin/includes/translation-install.php

@@ -203 +203 @@
         }
 
-        if ( wp_disallow_file_mods( 'download_language_pack' ) ) {
+        if ( ! wp_is_file_mod_allowed( 'download_language_pack' ) ) {
                 return false;
         }
@@ -246 +246 @@
  */
 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;
         }

trunk/src/wp-includes/capabilities.php

@@ -363 +363 @@
                 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 ) )
@@ -381 +381 @@
                 // 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 ) ) {

trunk/src/wp-includes/load.php

@@ -1100 +1100 @@
  * @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.
@@ -1106 +1106 @@
          * @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 );
+}