Ticket #18292: 18292.diff

src/wp-admin/network/upgrade.php

@@ -60 +60 @@
                         echo '<p>' . __( 'All done!' ) . '</p>';
                         break;
                 }
+
+                $auto_next = true;
                 echo "<ul>";
                 foreach ( (array) $blogs as $details ) {
                         switch_to_blog( $details['blog_id'] );
@@ -71 +73 @@
 
                         $response = wp_remote_get( $upgrade_url, array( 'timeout' => 120, 'httpversion' => '1.1' ) );
                         if ( is_wp_error( $response ) ) {
-                                wp_die( sprintf(
+                                echo sprintf(
                                         /* translators: 1: site url, 2: server error message */
                                         __( 'Warning! Problem updating %1$s. Your server may not be able to connect to sites running on it. Error message: %2$s' ),
                                         $siteurl,
                                         '<em>' . $response->get_error_message() . '</em>'
-                                ) );
+                                );
+                                $auto_next = false;
                         }
 
                         /**
@@ -98 +101 @@
                 }
                 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>
+                <?php if ( $auto_next ) : ?>
                 <script type="text/javascript">
                 <!--
                 function nextpage() {
@@ -106 +110 @@
                 setTimeout( "nextpage()", 250 );
                 //-->
                 </script><?php
+                endif;
         break;
         case 'show':
         default: