From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 11 Jan 2014 21:55:50 +0000 (+0000)
Subject: Merge "WebInstaller: Don't call getSoftwareLink()"
X-Git-Tag: 1.31.0-rc.0~17283
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=5330243416aa197c92b37648d95e77f1c5142939;p=lhc%2Fweb%2Fwiklou.git

Merge "WebInstaller: Don't call getSoftwareLink()"
---

5330243416aa197c92b37648d95e77f1c5142939
diff --cc includes/db/DatabaseMssql.php
index 89370896e3,7fc655fdb6..9636da5536
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@@ -780,10 -726,10 +780,10 @@@ class DatabaseMssql extends DatabaseBas
  	}
  
  	/**
 -	 * @return string wikitext of a link to the server software's web site
 +	 * @return string Wikitext of a link to the server software's web site
  	 */
  	public function getSoftwareLink() {
- 		return "[http://www.microsoft.com/sql/ MS SQL Server]";
+ 		return "[{{int:version-db-mssql-url}} MS SQL Server]";
  	}
  
  	/**
diff --cc includes/db/DatabasePostgres.php
index 9f96ccbf57,536e464f31..7f0ea97635
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@@ -1173,10 -1137,10 +1173,10 @@@ __INDEXATTR__
  	}
  
  	/**
 -	 * @return string wikitext of a link to the server software's web site
 +	 * @return string Wikitext of a link to the server software's web site
  	 */
  	public function getSoftwareLink() {
- 		return '[http://www.postgresql.org/ PostgreSQL]';
+ 		return '[{{int:version-db-postgres-url}} PostgreSQL]';
  	}
  
  	/**