| Index: branches/new-installer/phase3/includes/installer/Installer.i18n.php |
| — | — | @@ -71,6 +71,7 @@ |
| 72 | 72 | 'config-env-latest-ok' => 'You are installing the latest version of Mediawiki.', |
| 73 | 73 | 'config-env-latest-new' => "'''Note:''' You are installing a development version of Mediawiki.", |
| 74 | 74 | 'config-env-latest-can-not-check' => "'''Note:''' We were unable to retrieve information about the latest MediaWiki release (from [$1]).", |
| | 75 | + 'config-env-latest-data-invalid' => "'''Warning:''' When trying to check if this version was outdated we got invalid data from [$1].", |
| 75 | 76 | 'config-env-latest-old' => "'''Warning:''' You are installing an outdated version of Mediawiki.", |
| 76 | 77 | 'config-env-latest-help' => 'You are installing version $1, but the latest version is $2. |
| 77 | 78 | You are advised to use the latest release, which can be downloaded from [http://www.mediawiki.org/wiki/Download mediawiki.org]', |
| Index: branches/new-installer/phase3/includes/installer/Installer.php |
| — | — | @@ -361,6 +361,12 @@ |
| 362 | 362 | return; |
| 363 | 363 | } |
| 364 | 364 | $latestInfo = unserialize($latestInfo); |
| | 365 | + if ($latestInfo === false || !isset( $latestInfo['mwreleases'] ) ) { |
| | 366 | + # For when the request is successful but there's e.g. some silly man in |
| | 367 | + # the middle firewall blocking us, e.g. one of those annoying airport ones |
| | 368 | + $this->showMessage( 'config-env-latest-data-invalid', $latestInfoUrl ); |
| | 369 | + return; |
| | 370 | + } |
| 365 | 371 | foreach( $latestInfo['mwreleases'] as $rel ) { |
| 366 | 372 | if( isset( $rel['current'] ) ) |
| 367 | 373 | $currentVersion = $rel['version']; |