Changeset 31708

Timestamp:

03/10/2015 11:19:02 PM (10 years ago)

Author:

SergeyBiryukov

Message:

Revert the part of [31168] that [31701] was trying to fix.

default-filters.php is loaded before the $current_site global is set, so is_main_site() cannot be used there.

fixes #30947.

Location:

trunk/src/wp-includes

Files:

• default-filters.php (modified) (1 diff)
• update.php (modified) (1 diff)

trunk/src/wp-includes/default-filters.php

@@ -359 +359 @@
 add_action( 'init', 'create_initial_taxonomies', 0 ); // highest priority
 
-// Update
-if ( ( is_main_site() || is_network_admin() ) && ! ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
-    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'               );
-    add_action( 'load-update-core.php',      'wp_update_plugins'               );
-    add_action( 'admin_init',                '_maybe_update_plugins'           );
-    add_action( 'wp_update_plugins',         'wp_update_plugins'               );
-    add_action( 'upgrader_process_complete', 'wp_update_plugins',        10, 0 );
-
-    add_action( 'load-themes.php',           'wp_update_themes'                );
-    add_action( 'load-update.php',           'wp_update_themes'                );
-    add_action( 'load-update-core.php',      'wp_update_themes'                );
-    add_action( 'admin_init',                '_maybe_update_themes'            );
-    add_action( 'wp_update_themes',          'wp_update_themes'                );
-    add_action( 'upgrader_process_complete', 'wp_update_themes',         10, 0 );
-
-    add_action( 'update_option_WPLANG',      'wp_clean_update_cache',    10, 0 );
-    add_action( 'wp_maybe_auto_update',      'wp_maybe_auto_update'            );
-    add_action( 'init',                      'wp_schedule_update_checks'       );
-}
-
 // Canonical
 add_action( 'template_redirect', 'redirect_canonical' );

trunk/src/wp-includes/update.php

@@ -664 +664 @@
     delete_site_transient( 'update_core' );
 }
+
+if ( ( ! is_main_site() && ! is_network_admin() ) || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
+    return;
+}
+
+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' );
+add_action( 'load-update-core.php', 'wp_update_plugins' );
+add_action( 'admin_init', '_maybe_update_plugins' );
+add_action( 'wp_update_plugins', 'wp_update_plugins' );
+add_action( 'upgrader_process_complete', 'wp_update_plugins', 10, 0 );
+
+add_action( 'load-themes.php', 'wp_update_themes' );
+add_action( 'load-update.php', 'wp_update_themes' );
+add_action( 'load-update-core.php', 'wp_update_themes' );
+add_action( 'admin_init', '_maybe_update_themes' );
+add_action( 'wp_update_themes', 'wp_update_themes' );
+add_action( 'upgrader_process_complete', 'wp_update_themes', 10, 0 );
+
+add_action( 'update_option_WPLANG', 'wp_clean_update_cache' , 10, 0 );
+
+add_action( 'wp_maybe_auto_update', 'wp_maybe_auto_update' );
+
+add_action( 'init', 'wp_schedule_update_checks' );