Ticket #37436: 37436.3.diff

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

@@ -31 +31 @@
          */
         public function is_disabled() {
                 // Background updates are disabled if you don't want file changes.
-                if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
+                if ( wp_disallow_file_mods() ) {
                         return true;
+                }
 
                 if ( wp_installing() )
                         return true;

src/wp-admin/includes/dashboard.php

@@ -1149 +1149 @@
                 )
         );
 
-        if ( ( ! 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_disallow_file_mods() && ( ! 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(

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

@@ -181 +181 @@
                 return $download;
         }
 
-        if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
+        if ( wp_disallow_file_mods() ) {
                 return false;
         }
 
@@ -224 +224 @@
  * @return bool Returns true on success, false on failure.
  */
 function wp_can_install_language_pack() {
-        if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
+        if ( wp_disallow_file_mods() ) {
                 return false;
         }
 

src/wp-admin/includes/upgrade.php

@@ -559 +559 @@
         if ( $wp_current_db_version < 37965 )
                 upgrade_460();
 
+        if ( $wp_current_db_version < 38613 )
+                upgrade_470();
+
         maybe_disable_link_manager();
 
         maybe_disable_automattic_widgets();
@@ -1727 +1730 @@
 }
 
 /**
+ * Executes changes made in WordPress 4.7.0.
+ *
+ * @ignore
+ * @since 4.6.0
+ *
+ * @global int $wp_current_db_version Current database version.
+ */
+function upgrade_470() {
+        global $wp_current_db_version;
+
+        // Remove unused post meta.
+        if ( $wp_current_db_version < 38613 ) {
+                delete_transient( $cache_key = 'dash_' . md5( 'dashboard_primary_' . get_locale() ) );
+        }
+}
+
+/**
  * Executes network-level upgrade routines.
  *
  * @since 3.0.0

src/wp-includes/capabilities.php

@@ -333 +333 @@
         case 'edit_plugins':
         case 'edit_themes':
                 // Disallow the file editors.
-                if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
+                if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) {
                         $caps[] = 'do_not_allow';
-                elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
+                } elseif ( wp_disallow_file_mods() ) {
                         $caps[] = 'do_not_allow';
-                elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+                } elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
                         $caps[] = 'do_not_allow';
-                else
+                } else {
                         $caps[] = $cap;
+                }
                 break;
         case 'update_plugins':
         case 'delete_plugins':
@@ -353 +354 @@
         case 'update_core':
                 // Disallow anything that creates, deletes, or updates core, plugin, or theme files.
                 // Files in uploads are excepted.
-                if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
+                if ( wp_disallow_file_mods() ) {
                         $caps[] = 'do_not_allow';
                 } elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
                         $caps[] = 'do_not_allow';

src/wp-includes/load.php

@@ -1056 +1056 @@
 }
 
 /**
+ * Determines whether file modifications are disallowed.
+ *
+ * @since 4.7.0
+ *
+ * @return bool True if file modifications are disallowed, false otherwise.
+ */
+function wp_disallow_file_mods() {
+        return defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS;
+}
+
+/**
  * Check whether variable is a WordPress Error.
  *
  * Returns true if $thing is an object of the WP_Error class.

src/wp-includes/version.php

@@ -11 +11 @@
  *
  * @global int $wp_db_version
  */
-$wp_db_version = 38590;
+$wp_db_version = 38613;
 
 /**
  * Holds the TinyMCE version