http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71128
Revision: 71128
Author: jeroendedauw
Date: 2010-08-15 16:42:43 +0000 (Sun, 15 Aug 2010)
Log Message:
-----------
Error message tweaks
Modified Paths:
--------------
trunk/phase3/includes/PackageRepository.php
trunk/phase3/includes/installer/Installer.i18n.php
trunk/phase3/includes/installer/Installer.php
Modified: trunk/phase3/includes/PackageRepository.php
===================================================================
--- trunk/phase3/includes/PackageRepository.php 2010-08-15 16:36:31 UTC (rev
71127)
+++ trunk/phase3/includes/PackageRepository.php 2010-08-15 16:42:43 UTC (rev
71128)
@@ -99,6 +99,17 @@
*/
public function __construct( $location ) {
$this->location = $location;
- }
+ }
+
+ /**
+ * Returns the repository location.
+ *
+ * @since 1.17
+ *
+ * @return string
+ */
+ public function getLocation() {
+ return $this->location;
+ }
}
\ No newline at end of file
Modified: trunk/phase3/includes/installer/Installer.i18n.php
===================================================================
--- trunk/phase3/includes/installer/Installer.i18n.php 2010-08-15 16:36:31 UTC
(rev 71127)
+++ trunk/phase3/includes/installer/Installer.i18n.php 2010-08-15 16:42:43 UTC
(rev 71128)
@@ -77,8 +77,7 @@
'config-env-php' => 'PHP $1 is installed.',
'config-env-latest-ok' => 'You are installing the latest
version of Mediawiki.',
'config-env-latest-new' => "'''Note:''' You are installing a
development version of Mediawiki.",
- 'config-env-latest-can-not-check' => "'''Note:''' The installer was
unable to retrieve information about the latest MediaWiki release from [$1].",
- 'config-env-latest-data-invalid' => "'''Warning:''' When trying to
check if this version was outdated invalid data was retrieved from [$1].",
+ 'config-env-latest-can-not-check' => "'''Warning:''' The installer was
unable to retrieve information about the latest MediaWiki release from [$1].",
'config-env-latest-old' => "'''Warning:''' You are installing
an outdated version of Mediawiki.",
'config-env-latest-help' => 'You are installing version $1,
but the latest version is $2.
You are advised to use the latest release, which can be downloaded from
[http://www.mediawiki.org/wiki/Download mediawiki.org]',
Modified: trunk/phase3/includes/installer/Installer.php
===================================================================
--- trunk/phase3/includes/installer/Installer.php 2010-08-15 16:36:31 UTC
(rev 71127)
+++ trunk/phase3/includes/installer/Installer.php 2010-08-15 16:42:43 UTC
(rev 71128)
@@ -385,25 +385,19 @@
$repository = wfGetRepository();
$currentVersion = $repository->getLatestCoreVersion();
-
- /*
- if( !$latestInfo ) {
- $this->showMessage( 'config-env-latest-can-not-check',
$latestInfoUrl );
- return;
- }
- */
$this->setVar( '_ExternalHTTP', true );
if ( $currentVersion === false ) {
# For when the request is successful but there's e.g.
some silly man in
# the middle firewall blocking us, e.g. one of those
annoying airport ones
- $this->showMessage( 'config-env-latest-data-invalid',
$latestInfoUrl );
+ $this->showMessage( 'config-env-latest-can-not-check',
$repository->getLocation() );
return;
}
if( version_compare( $wgVersion, $currentVersion, '<' ) ) {
$this->showMessage( 'config-env-latest-old' );
+ // FIXME: this only works for the web installer!
$this->showHelpBox( 'config-env-latest-help',
$wgVersion, $currentVersion );
} elseif( version_compare( $wgVersion, $currentVersion, '>' ) )
{
$this->showMessage( 'config-env-latest-new' );
@@ -438,6 +432,7 @@
if ( !$compiledDBs ) {
$this->showMessage( 'config-no-db' );
+ // FIXME: this only works for the web installer!
$this->showHelpBox( 'config-no-db-help',
$wgLang->commaList( $allNames ) );
return false;
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
