Merge branch 'MDL-59509-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE

2017-07-24 13:03:52 +02:00
parent d413b817e8 823b857617
commit 0d7e0ccf4e
1 changed files with 7 additions and 1 deletions
@@ -182,7 +182,13 @@ class sqlsrv_native_moodle_database extends moodle_database {
        sqlsrv_configure("LogSeverity", SQLSRV_LOG_SEVERITY_ERROR);

        $this->store_settings($dbhost, $dbuser, $dbpass, $dbname, $prefix, $dboptions);
-        $this->sqlsrv = sqlsrv_connect($this->dbhost, array
+
+        $dbhost = $this->dbhost;
+        if (!empty($dboptions['dbport'])) {
+            $dbhost .= ',' . $dboptions['dbport'];
+        }
+
+        $this->sqlsrv = sqlsrv_connect($dbhost, array
         (
          'UID' => $this->dbuser,
          'PWD' => $this->dbpass,