From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Thu, 22 Mar 2012 16:44:09 +0000 (+0100)
Subject: Also display get the short SHA-1 in SpecialVersion::getVersion() instead of only... 
X-Git-Tag: 1.31.0-rc.0~24155
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=731d4700c7d30b7ac545f8395dd2f2a31aa75a9a;p=lhc%2Fweb%2Fwiklou.git

Also display get the short SHA-1 in SpecialVersion::getVersion() instead of only in getVersionLinked()

Change-Id: I2f4839fb587903524fdaf041597174003ccfdfeb
---

diff --git a/includes/specials/SpecialVersion.php b/includes/specials/SpecialVersion.php
index 2b44337bb6..f88e9da4f2 100644
--- a/includes/specials/SpecialVersion.php
+++ b/includes/specials/SpecialVersion.php
@@ -160,10 +160,14 @@ class SpecialVersion extends SpecialPage {
 		global $wgVersion, $IP;
 		wfProfileIn( __METHOD__ );
 
-		$info = self::getSvnInfo( $IP );
-		if ( !$info ) {
+		$gitInfo = self::getGitHeadSha1( $IP );
+		$svnInfo = self::getSvnInfo( $IP );
+		if ( !$svnInfo && !$gitInfo ) {
 			$version = $wgVersion;
-		} elseif( $flags === 'nodb' ) {
+		} elseif ( $gitInfo ) {
+			$shortSha1 = substr( $gitInfo, 0, 7 );
+			$version = "$wgVersion ($shortSha1)";
+		} elseif ( $flags === 'nodb' ) {
 			$version = "$wgVersion (r{$info['checkout-rev']})";
 		} else {
 			$version = $wgVersion . ' ' .