Do not block the installer (through an unhandled exception) when we can't connect...

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 51d78f6..bb87390 100644 (file)
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -1150,7 +1150,13 @@ abstract class Installer {
                                        break;
                                }
 
-                               $text = Http::get( $url . $file, array( 'timeout' => 3 ) );
+                               try {
+                                       $text = Http::get( $url . $file, array( 'timeout' => 3 ) );
+                               }
+                               catch( MWException $e ) {
+                                       // Http::get throws with allow_url_fopen = false and no curl extension.
+                                       $text = null;
+                               }
                                unlink( $dir . $file );
 
                                if ( $text == 'exec' ) {