Blob Blame History Raw
diff -up wordpress/wp-admin/includes/admin-filters.php.rpm wordpress/wp-admin/includes/admin-filters.php
--- wordpress/wp-admin/includes/admin-filters.php.rpm	2016-07-31 20:11:29.000000000 +0200
+++ wordpress/wp-admin/includes/admin-filters.php	2017-06-09 13:27:51.184747881 +0200
@@ -106,7 +106,6 @@ add_action( 'profile_update', 'default_p
 add_action( 'load-plugins.php', 'wp_plugin_update_rows', 20 ); // After wp_update_plugins() is called.
 add_action( 'load-themes.php', 'wp_theme_update_rows', 20 ); // After wp_update_themes() is called.
 
-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-core-upgrader.php.rpm wordpress/wp-admin/includes/class-core-upgrader.php
--- wordpress/wp-admin/includes/class-core-upgrader.php.rpm	2016-07-08 15:19:30.000000000 +0200
+++ wordpress/wp-admin/includes/class-core-upgrader.php	2017-06-09 13:27:51.184747881 +0200
@@ -236,6 +236,9 @@ class Core_Upgrader extends WP_Upgrader
 	 * @return bool True if we should update to the offered version, otherwise false.
 	 */
 	public static function should_update_to_version( $offered_ver ) {
+		// RPM: nether allow core update
+		return false;
+
 		include( ABSPATH . WPINC . '/version.php' ); // $wp_version; // x.y.z
 
 		$current_branch = implode( '.', array_slice( preg_split( '/[.-]/', $wp_version  ), 0, 2 ) ); // x.y
diff -up wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm wordpress/wp-admin/includes/class-wp-automatic-updater.php
--- wordpress/wp-admin/includes/class-wp-automatic-updater.php.rpm	2017-06-09 13:27:51.184747881 +0200
+++ wordpress/wp-admin/includes/class-wp-automatic-updater.php	2017-06-09 13:30:18.175525864 +0200
@@ -38,7 +38,7 @@ class WP_Automatic_Updater {
 			return true;
 
 		// More fine grained control can be done through the WP_AUTO_UPDATE_CORE constant and filters.
-		$disabled = defined( 'AUTOMATIC_UPDATER_DISABLED' ) && AUTOMATIC_UPDATER_DISABLED;
+		$disabled = !defined( 'AUTOMATIC_UPDATER_DISABLED' ) || AUTOMATIC_UPDATER_DISABLED;
 
 		/**
 		 * Filters whether to entirely disable background updates.
diff -up wordpress/wp-admin/includes/update.php.rpm wordpress/wp-admin/includes/update.php
--- wordpress/wp-admin/includes/update.php.rpm	2017-05-06 16:30:40.000000000 +0200
+++ wordpress/wp-admin/includes/update.php	2017-06-09 13:27:51.185747886 +0200
@@ -279,7 +279,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 .= '';
 	}
 
 	/* translators: 1: version number, 2: theme name */
diff -up wordpress/wp-includes/load.php.rpm wordpress/wp-includes/load.php
--- wordpress/wp-includes/load.php.rpm	2017-06-09 13:33:24.946514394 +0200
+++ wordpress/wp-includes/load.php	2017-06-09 13:33:35.654571069 +0200
@@ -1108,5 +1108,5 @@ function wp_is_file_mod_allowed( $contex
 	 * @param bool   $file_mod_allowed Whether file modifications are allowed.
 	 * @param string $context          The usage context.
 	 */
-	return apply_filters( 'file_mod_allowed', ! defined( 'DISALLOW_FILE_MODS' ) || ! DISALLOW_FILE_MODS, $context );
+	return apply_filters( 'file_mod_allowed', defined( 'DISALLOW_FILE_MODS' ) && ! DISALLOW_FILE_MODS, $context );
 }
diff -up wordpress/wp-includes/update.php.rpm wordpress/wp-includes/update.php
--- wordpress/wp-includes/update.php.rpm	2017-05-06 16:30:40.000000000 +0200
+++ wordpress/wp-includes/update.php	2017-06-09 13:27:51.185747886 +0200
@@ -683,9 +683,6 @@ function _maybe_update_themes() {
  * @since 3.1.0
  */
 function wp_schedule_update_checks() {
-	if ( ! wp_next_scheduled( 'wp_version_check' ) && ! wp_installing() )
-		wp_schedule_event(time(), 'twicedaily', 'wp_version_check');
-
 	if ( ! wp_next_scheduled( 'wp_update_plugins' ) && ! wp_installing() )
 		wp_schedule_event(time(), 'twicedaily', 'wp_update_plugins');