From 772c5c07a55b6217e0fb067ff5ff87e18218e82c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Niklas=20Laxstr=C3=B6m?= Date: Sat, 2 May 2009 10:49:37 +0000 Subject: [PATCH] * Hack for checkLanguage.php to work without database --- includes/specials/SpecialVersion.php | 14 ++++++++++---- maintenance/language/checkLanguage.inc | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php index 1b3cb09958..18583a927e 100644 --- a/includes/specials/SpecialVersion.php +++ b/includes/specials/SpecialVersion.php @@ -111,12 +111,18 @@ class SpecialVersion extends SpecialPage { * * @return mixed */ - public static function getVersion() { + public static function getVersion( $flags = '' ) { global $wgVersion, $IP; wfProfileIn( __METHOD__ ); - $svn = self::getSvnRevision( $IP, false, false , false); - $svnCo = self::getSvnRevision( $IP, true, false , false); - $version = $svn ? $wgVersion . wfMsg( 'version-svn-revision', $svn, $svnCo ) : $wgVersion; + $svn = self::getSvnRevision( $IP, false, false , false ); + $svnCo = self::getSvnRevision( $IP, true, false , false ); + if ( !$svn ) { + $version = $wgVersion; + } elseif( $flags === 'nodb' ) { + $version = "$wgVersion ($svnCo)"; + } else { + $version = $wgVersion . wfMsg( 'version-svn-revision', $svn, $svnCo ); + } wfProfileOut( __METHOD__ ); return $version; } diff --git a/maintenance/language/checkLanguage.inc b/maintenance/language/checkLanguage.inc index 486490e036..6232064bbc 100644 --- a/maintenance/language/checkLanguage.inc +++ b/maintenance/language/checkLanguage.inc @@ -418,7 +418,7 @@ ENDS; $tableRows = implode( "\n|-\n", $rows ); - $version = SpecialVersion::getVersion( $IP ); + $version = SpecialVersion::getVersion( 'nodb' ); echo <<$version -- 2.20.1