Remi Collet
b38de53bcd
(cherry picked from commitef3a22d1f4) (cherry picked from commit50ad660690)
74 lines
4.1 KiB
Diff
74 lines
4.1 KiB
Diff
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 2019-02-21 15:14:36.864022775 +0100
|
|
+++ wordpress/wp-admin/includes/admin-filters.php 2019-02-21 15:14:46.729070707 +0100
|
|
@@ -116,7 +116,6 @@ add_action( 'personal_options_update', '
|
|
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 2019-02-21 15:14:36.864022775 +0100
|
|
+++ wordpress/wp-admin/includes/class-core-upgrader.php 2019-02-21 15:14:46.729070707 +0100
|
|
@@ -250,6 +250,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 2019-02-21 15:14:36.864022775 +0100
|
|
+++ wordpress/wp-admin/includes/class-wp-automatic-updater.php 2019-02-21 15:14:46.729070707 +0100
|
|
@@ -38,7 +38,7 @@ class WP_Automatic_Updater {
|
|
}
|
|
|
|
// 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 2019-02-21 15:14:36.865022780 +0100
|
|
+++ wordpress/wp-admin/includes/update.php 2019-02-21 15:14:46.729070707 +0100
|
|
@@ -301,7 +301,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 .= '';
|
|
}
|
|
}
|
|
|
|
diff -up wordpress/wp-includes/load.php.rpm wordpress/wp-includes/load.php
|
|
--- wordpress/wp-includes/load.php.rpm 2019-01-30 12:01:52.000000000 +0100
|
|
+++ wordpress/wp-includes/load.php 2019-02-21 15:14:36.865022780 +0100
|
|
@@ -1259,7 +1259,7 @@ 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 2019-02-21 15:14:36.865022780 +0100
|
|
+++ wordpress/wp-includes/update.php 2019-02-21 15:16:50.428671765 +0100
|
|
@@ -770,10 +770,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' );
|
|
}
|