Blob Blame History Raw
diff -up wordpress/wp-admin/includes/admin-filters.php.noupdate wordpress/wp-admin/includes/admin-filters.php
--- wordpress/wp-admin/includes/admin-filters.php.noupdate	2015-08-26 09:56:30.113424058 +0200
+++ wordpress/wp-admin/includes/admin-filters.php	2015-08-26 09:56:50.729529575 +0200
@@ -101,7 +101,6 @@ add_action( 'profile_update', 'default_p
 add_action( 'admin_init', 'wp_plugin_update_rows' );
 add_action( 'admin_init', 'wp_theme_update_rows'  );
 
-add_action( 'admin_notices', 'update_nag',      3  );
 add_action( 'admin_notices', 'maintenance_nag', 10 );
 
 add_filter( 'update_footer', 'core_update_footer' );
diff -up wordpress/wp-admin/includes/class-wp-upgrader.php.noupdate wordpress/wp-admin/includes/class-wp-upgrader.php
--- wordpress/wp-admin/includes/class-wp-upgrader.php.noupdate	2015-07-29 16:57:25.000000000 +0200
+++ wordpress/wp-admin/includes/class-wp-upgrader.php	2015-08-26 09:55:58.269261073 +0200
@@ -2276,6 +2276,9 @@ class Core_Upgrader extends WP_Upgrader
 			}
 		}
 
+		// RPM: nether allow core update
+		return false;
+
 		// 1: If we're already on that version, not much point in updating?
 		if ( $offered_ver == $wp_version )
 			return false;
@@ -2510,7 +2513,7 @@ class WP_Automatic_Updater {
 	 */
 	public function is_disabled() {
 		// Background updates are disabled if you don't want file changes.
-		if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
+		if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS )
 			return true;
 
 		if ( defined( 'WP_INSTALLING' ) )
diff -up wordpress/wp-admin/includes/ms-admin-filters.php.noupdate wordpress/wp-admin/includes/ms-admin-filters.php
--- wordpress/wp-admin/includes/ms-admin-filters.php.noupdate	2015-08-26 09:57:03.337594106 +0200
+++ wordpress/wp-admin/includes/ms-admin-filters.php	2015-08-26 09:57:09.398625127 +0200
@@ -38,5 +38,4 @@ add_action( 'admin_notices',         'si
 add_action( 'network_admin_notices', 'site_admin_notice' );
 
 // Update Hooks
-add_action( 'network_admin_notices', 'update_nag',      3  );
 add_action( 'network_admin_notices', 'maintenance_nag', 10 );
diff -up wordpress/wp-admin/includes/update.php.noupdate wordpress/wp-admin/includes/update.php
--- wordpress/wp-admin/includes/update.php.noupdate	2015-07-07 02:02:24.000000000 +0200
+++ wordpress/wp-admin/includes/update.php	2015-08-26 09:56:00.298271458 +0200
@@ -251,7 +251,7 @@ function update_right_now_message() {
 		$cur = get_preferred_from_update_core();
 
 		if ( isset( $cur->response ) && $cur->response == 'upgrade' )
-			$msg .= '<a href="' . network_admin_url( 'update-core.php' ) . '" class="button" aria-describedby="wp-version">' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a> ';
+			$msg .= '';
 	}
 
 	$msg .= sprintf( '<span id="wp-version">' . __( 'WordPress %1$s running %2$s theme.' ) . '</span>', get_bloginfo( 'version', 'display' ), $theme_name );
diff -up wordpress/wp-includes/capabilities.php.noupdate wordpress/wp-includes/capabilities.php
--- wordpress/wp-includes/capabilities.php.noupdate	2015-08-14 00:31:24.000000000 +0200
+++ wordpress/wp-includes/capabilities.php	2015-08-26 09:56:00.299271463 +0200
@@ -1337,7 +1337,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 ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
+		elseif ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS )
 			$caps[] = 'do_not_allow';
 		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
 			$caps[] = 'do_not_allow';
@@ -1355,7 +1355,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 ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
+		if ( !defined( 'DISALLOW_FILE_MODS' ) || DISALLOW_FILE_MODS ) {
 			$caps[] = 'do_not_allow';
 		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
 			$caps[] = 'do_not_allow';
diff -up wordpress/wp-includes/update.php.noupdate wordpress/wp-includes/update.php
--- wordpress/wp-includes/update.php.noupdate	2015-05-28 17:29:28.000000000 +0200
+++ wordpress/wp-includes/update.php	2015-08-26 09:56:00.299271463 +0200
@@ -636,9 +636,6 @@ function _maybe_update_themes() {
  * @since 3.1.0
  */
 function wp_schedule_update_checks() {
-	if ( !wp_next_scheduled('wp_version_check') && !defined('WP_INSTALLING') )
-		wp_schedule_event(time(), 'twicedaily', 'wp_version_check');
-
 	if ( !wp_next_scheduled('wp_update_plugins') && !defined('WP_INSTALLING') )
 		wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins');
 
@@ -680,8 +677,6 @@ if ( ( ! is_main_site() && ! is_network_
 }
 
 add_action( 'admin_init', '_maybe_update_core' );
-add_action( 'wp_version_check', 'wp_version_check' );
-add_action( 'upgrader_process_complete', 'wp_version_check', 10, 0 );
 
 add_action( 'load-plugins.php', 'wp_update_plugins' );
 add_action( 'load-update.php', 'wp_update_plugins' );