| Index: trunk/phase3/includes/PackageRepository.php |
| — | — | @@ -99,6 +99,17 @@ |
| 100 | 100 | */ |
| 101 | 101 | public function __construct( $location ) { |
| 102 | 102 | $this->location = $location; |
| 103 | | - } |
| | 103 | + } |
| | 104 | + |
| | 105 | + /** |
| | 106 | + * Returns the repository location. |
| | 107 | + * |
| | 108 | + * @since 1.17 |
| | 109 | + * |
| | 110 | + * @return string |
| | 111 | + */ |
| | 112 | + public function getLocation() { |
| | 113 | + return $this->location; |
| | 114 | + } |
| 104 | 115 | |
| 105 | 116 | } |
| \ No newline at end of file |
| Index: trunk/phase3/includes/installer/Installer.php |
| — | — | @@ -385,25 +385,19 @@ |
| 386 | 386 | |
| 387 | 387 | $repository = wfGetRepository(); |
| 388 | 388 | $currentVersion = $repository->getLatestCoreVersion(); |
| 389 | | - |
| 390 | | - /* |
| 391 | | - if( !$latestInfo ) { |
| 392 | | - $this->showMessage( 'config-env-latest-can-not-check', $latestInfoUrl ); |
| 393 | | - return; |
| 394 | | - } |
| 395 | | - */ |
| 396 | 389 | |
| 397 | 390 | $this->setVar( '_ExternalHTTP', true ); |
| 398 | 391 | |
| 399 | 392 | if ( $currentVersion === false ) { |
| 400 | 393 | # For when the request is successful but there's e.g. some silly man in |
| 401 | 394 | # the middle firewall blocking us, e.g. one of those annoying airport ones |
| 402 | | - $this->showMessage( 'config-env-latest-data-invalid', $latestInfoUrl ); |
| | 395 | + $this->showMessage( 'config-env-latest-can-not-check', $repository->getLocation() ); |
| 403 | 396 | return; |
| 404 | 397 | } |
| 405 | 398 | |
| 406 | 399 | if( version_compare( $wgVersion, $currentVersion, '<' ) ) { |
| 407 | 400 | $this->showMessage( 'config-env-latest-old' ); |
| | 401 | + // FIXME: this only works for the web installer! |
| 408 | 402 | $this->showHelpBox( 'config-env-latest-help', $wgVersion, $currentVersion ); |
| 409 | 403 | } elseif( version_compare( $wgVersion, $currentVersion, '>' ) ) { |
| 410 | 404 | $this->showMessage( 'config-env-latest-new' ); |
| — | — | @@ -438,6 +432,7 @@ |
| 439 | 433 | |
| 440 | 434 | if ( !$compiledDBs ) { |
| 441 | 435 | $this->showMessage( 'config-no-db' ); |
| | 436 | + // FIXME: this only works for the web installer! |
| 442 | 437 | $this->showHelpBox( 'config-no-db-help', $wgLang->commaList( $allNames ) ); |
| 443 | 438 | return false; |
| 444 | 439 | } |
| Index: trunk/phase3/includes/installer/Installer.i18n.php |
| — | — | @@ -77,8 +77,7 @@ |
| 78 | 78 | 'config-env-php' => 'PHP $1 is installed.', |
| 79 | 79 | 'config-env-latest-ok' => 'You are installing the latest version of Mediawiki.', |
| 80 | 80 | 'config-env-latest-new' => "'''Note:''' You are installing a development version of Mediawiki.", |
| 81 | | - 'config-env-latest-can-not-check' => "'''Note:''' The installer was unable to retrieve information about the latest MediaWiki release from [$1].", |
| 82 | | - 'config-env-latest-data-invalid' => "'''Warning:''' When trying to check if this version was outdated invalid data was retrieved from [$1].", |
| | 81 | + 'config-env-latest-can-not-check' => "'''Warning:''' The installer was unable to retrieve information about the latest MediaWiki release from [$1].", |
| 83 | 82 | 'config-env-latest-old' => "'''Warning:''' You are installing an outdated version of Mediawiki.", |
| 84 | 83 | 'config-env-latest-help' => 'You are installing version $1, but the latest version is $2. |
| 85 | 84 | You are advised to use the latest release, which can be downloaded from [http://www.mediawiki.org/wiki/Download mediawiki.org]', |