Ticket #18292: 18292.patch

wp-admin/network/upgrade.php

@@ -52 +52 @@
                         echo '<p>' . __( 'All done!' ) . '</p>';
                         break;
                 }
-                echo "<ul>";
+                echo '<ul>';
                 foreach ( (array) $blogs as $details ) {
                         $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' ) );
+                        echo '<li>' . $siteurl;
+                        $response = wp_remote_get( get_admin_url( $details['blog_id'], 'upgrade.php?step=upgrade_db' ), array( 'timeout' => 120, 'httpversion' => '1.1' ) );
                         if ( is_wp_error( $response ) )
-                                wp_die( sprintf( __( 'Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: <em>%2$s</em>' ), $siteurl, $response->get_error_message() ) );
+                                echo '<p>' . sprintf( __( 'Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: <em>%2$s</em>' ), $siteurl, $response->get_error_message() ) . '</p>';
+                        echo '</li>';
                         do_action( 'after_mu_upgrade', $response );
                         do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
                 }
-                echo "</ul>";
+                echo '</ul>';
                 ?><p><?php _e( 'If your browser doesn&#8217;t start loading the next page automatically, click this link:' ); ?> <a class="button" href="upgrade.php?action=upgrade&amp;n=<?php echo ($n + 5) ?>"><?php _e("Next Sites"); ?></a></p>
                 <script type='text/javascript'>
                 <!--