* (bug 7970) Use current connection explicitly on Database::getServerVersion

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f870d03..a1b5dce 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -200,6 +200,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 7918) "Templates used on this page" is now shown for read-only pages.
 * (bug 7688) When viewing diff, section anchors in autosummary jump to section
   on current page instead of loading the latest version.
+* (bug 7970) Use current connection explicitly on Database::getServerVersion
 
 
 == Languages updated ==

diff --git a/includes/Database.php b/includes/Database.php
index 7dd734b..7b6df37 100644 (file)
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -1833,7 +1833,7 @@ class Database {
         * @return string Version information from the database
         */
        function getServerVersion() {
-               return mysql_get_server_info();
+               return mysql_get_server_info( $this->mConn );
        }
 
        /**