Changeset 14678

Timestamp:

05/15/2010 09:36:38 PM (14 years ago)

Author:

nacin

Message:

Use upgrade_db instead of step=1 in ms-upgrade-network. Also, no need to check spam/deleted/archived as that is in the query. see #11869.

File:

• trunk/wp-admin/ms-upgrade-network.php (modified) (1 diff)

trunk/wp-admin/ms-upgrade-network.php

@@ -44 +44 @@
         echo "<ul>";
         foreach ( (array) $blogs as $details ) {
-            if ( $details['spam'] == 0 && $details['deleted'] == 0 && $details['archived'] == 0 ) {
-                $siteurl = get_blog_option( $details['blog_id'], 'siteurl' );
-                echo "<li>$siteurl</li>";
-                $response = wp_remote_get( trailingslashit( $siteurl ) . "wp-admin/upgrade.php?step=1", array( 'timeout' => 120, 'httpversion' => '1.1' ) );
-                if ( is_wp_error( $response ) )
-                    wp_die( "<strong>Warning!</strong> Problem updating {$siteurl}. Your server may not be able to connect to sites running on it.<br /> Error message: <em>" . $response->get_error_message() ."</em>" );
-                do_action( 'after_mu_upgrade', $response );
-                do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
-            }
+            $siteurl = get_blog_option( $details['blog_id'], 'siteurl' );
+            echo "<li>$siteurl</li>";
+            $response = wp_remote_get( trailingslashit( $siteurl ) . "wp-admin/upgrade.php?step=upgrade_db", array( 'timeout' => 120, 'httpversion' => '1.1' ) );
+            if ( is_wp_error( $response ) )
+                wp_die( "<strong>Warning!</strong> Problem updating {$siteurl}. Your server may not be able to connect to sites running on it.<br /> Error message: <em>" . $response->get_error_message() ."</em>" );
+            do_action( 'after_mu_upgrade', $response );
+            do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
         }
         echo "</ul>";