http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88492
Revision: 88492
Author: platonides
Date: 2011-05-20 21:42:41 +0000 (Fri, 20 May 2011)
Log Message:
-----------
Do not block the installer (through an unhandled exception) when we can't
connect to ourself.
Modified Paths:
--------------
trunk/phase3/includes/installer/Installer.php
Modified: trunk/phase3/includes/installer/Installer.php
===================================================================
--- trunk/phase3/includes/installer/Installer.php 2011-05-20 21:39:55 UTC
(rev 88491)
+++ trunk/phase3/includes/installer/Installer.php 2011-05-20 21:42:41 UTC
(rev 88492)
@@ -1150,7 +1150,13 @@
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' ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
