Changes from branches/3.0/wp-includes/update.php at r15456 to trunk/wp-includes/update.php at r17231

File:

• trunk/wp-includes/update.php (modified) (5 diffs)

trunk/wp-includes/update.php

@@ -45 +45 @@
         $mysql_version = 'N/A';
 
-    $num_blogs = 1;
-    $wp_install = home_url( '/' );
-    $multisite_enabled = 0;
-    $user_count = count_users( );
     if ( is_multisite( ) ) {
+        $user_count = get_user_count( );
         $num_blogs = get_blog_count( );
         $wp_install = network_site_url( );
         $multisite_enabled = 1;
+    } else {
+        $user_count = count_users( );
+        $multisite_enabled = 0;
+        $num_blogs = 1;
+        $wp_install = home_url( '/' );
     }
 
@@ -113 +115 @@
  * @package WordPress
  * @since 2.3.0
- * @uses $wp_version Used to notidy the WordPress version.
+ * @uses $wp_version Used to notify the WordPress version.
  *
  * @return mixed Returns null if update is unsupported. Returns false if check is too soon.
@@ -198 +200 @@
  * @package WordPress
  * @since 2.7.0
- * @uses $wp_version Used to notidy the WordPress version.
+ * @uses $wp_version Used to notify the WordPress version.
  *
  * @return mixed Returns null if update is unsupported. Returns false if check is too soon.
@@ -335 +337 @@
 }
 
+/**
+ * Schedule core, theme, and plugin update checks.
+ *
+ * @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');
+
+    if ( !wp_next_scheduled('wp_update_themes') && !defined('WP_INSTALLING') )
+        wp_schedule_event(time(), 'twicedaily', 'wp_update_themes');
+}
+
+if ( ! is_main_site() )
+    return;
+
 add_action( 'admin_init', '_maybe_update_core' );
 add_action( 'wp_version_check', 'wp_version_check' );
@@ -350 +371 @@
 add_action( 'wp_update_themes', 'wp_update_themes' );
 
-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');
-
-if ( !wp_next_scheduled('wp_update_themes') && !defined('WP_INSTALLING') )
-    wp_schedule_event(time(), 'twicedaily', 'wp_update_themes');
+add_action('init', 'wp_schedule_update_checks');
 
 ?>