Permalink
Browse files

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

…nto MOODLE_33_STABLE
  • Loading branch information...
dmonllao committed Jul 24, 2017
2 parents d413b81 + 823b857 commit 0d7e0ccf4e352a82f825dece7c352cf8441a679b
Showing with 7 additions and 1 deletion.
  1. +7 −1 lib/dml/sqlsrv_native_moodle_database.php
@@ -182,7 +182,13 @@ public function connect($dbhost, $dbuser, $dbpass, $dbname, $prefix, array $dbop
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,

0 comments on commit 0d7e0cc

Please sign in to comment.