diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-17 15:12:31 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-09-17 15:12:31 +0000 |
| commit | 3b79fd122e8b0bc0a9666bda0c58c719a9c975e7 (patch) | |
| tree | d4c0d7900d479601f6f6397a34d76d5e770ede5b /phpBB/includes/db/mssql.php | |
| parent | b6949c47ec5762126f89cc9bb79cba8d5f9039ba (diff) | |
| download | forums-3b79fd122e8b0bc0a9666bda0c58c719a9c975e7.tar forums-3b79fd122e8b0bc0a9666bda0c58c719a9c975e7.tar.gz forums-3b79fd122e8b0bc0a9666bda0c58c719a9c975e7.tar.bz2 forums-3b79fd122e8b0bc0a9666bda0c58c719a9c975e7.tar.xz forums-3b79fd122e8b0bc0a9666bda0c58c719a9c975e7.zip | |
Use correct port delimiter for MSSQL connections in windows. (Bug #16615)
git-svn-id: file:///svn/phpbb/trunk@8867 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/db/mssql.php')
| -rw-r--r-- | phpBB/includes/db/mssql.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php index 7864f7a3d7..84e356efdd 100644 --- a/phpBB/includes/db/mssql.php +++ b/phpBB/includes/db/mssql.php @@ -34,9 +34,11 @@ class dbal_mssql extends dbal { $this->persistency = $persistency; $this->user = $sqluser; - $this->server = $sqlserver . (($port) ? ':' . $port : ''); $this->dbname = $database; + $port_delimiter = (defined('PHP_OS') && substr(PHP_OS, 0, 3) === 'WIN') ? ',' : ':'; + $this->server = $sqlserver . (($port) ? $port_delimiter . $port : ''); + @ini_set('mssql.charset', 'UTF-8'); @ini_set('mssql.textlimit', 2147483647); @ini_set('mssql.textsize', 2147483647); |