Merge "WebInstaller: Don't call getSoftwareLink()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 11 Jan 2014 21:55:50 +0000 (21:55 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 11 Jan 2014 21:55:50 +0000 (21:55 +0000)
1  2 
RELEASE-NOTES-1.23
includes/db/DatabaseMssql.php
includes/db/DatabaseMysqlBase.php
includes/db/DatabaseOracle.php
includes/db/DatabasePostgres.php
includes/db/DatabaseSqlite.php
languages/messages/MessagesQqq.php

Simple merge
@@@ -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]";
        }
  
        /**
Simple merge
Simple merge
@@@ -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]';
        }
  
        /**
Simple merge
Simple merge