diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
commit | a2190ac74dd4d7080b12bab90e552d7aa81209ef (patch) | |
tree | 8b31f38de9882d18df54cf8d9e0de74167a094eb /includes/db/DatabaseMssql.php | |
parent | 15e69f7b20b6596b9148030acce5b59993b95a45 (diff) | |
parent | 257401d8b2cf661adf36c84b0e3fd1cf85e33c22 (diff) |
Merge branch 'mw-1.26'
Diffstat (limited to 'includes/db/DatabaseMssql.php')
-rw-r--r-- | includes/db/DatabaseMssql.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php index 2b8f395f..85f1b96d 100644 --- a/includes/db/DatabaseMssql.php +++ b/includes/db/DatabaseMssql.php @@ -119,9 +119,9 @@ class DatabaseMssql extends DatabaseBase { $connectionInfo['PWD'] = $password; } - wfSuppressWarnings(); + MediaWiki\suppressWarnings(); $this->mConn = sqlsrv_connect( $server, $connectionInfo ); - wfRestoreWarnings(); + MediaWiki\restoreWarnings(); if ( $this->mConn === false ) { throw new DBConnectionError( $this, $this->lastError() ); @@ -1089,7 +1089,9 @@ class DatabaseMssql extends DatabaseBase { * @param string $s * @return string */ - public function strencode( $s ) { # Should not be called by us + public function strencode( $s ) { + // Should not be called by us + return str_replace( "'", "''", $s ); } |