aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/db/mssql.php
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2008-01-03 17:00:40 +0000
committerDavid M <davidmj@users.sourceforge.net>2008-01-03 17:00:40 +0000
commit85055ac97fa57ca339924cef719115d85bdf6c2e (patch)
tree1e19230af2689c3837356c0f7947719c0cdf67ef /phpBB/includes/db/mssql.php
parent0f26ffbadea13d97b841dfe56b21da7a5479000a (diff)
downloadforums-85055ac97fa57ca339924cef719115d85bdf6c2e.tar
forums-85055ac97fa57ca339924cef719115d85bdf6c2e.tar.gz
forums-85055ac97fa57ca339924cef719115d85bdf6c2e.tar.bz2
forums-85055ac97fa57ca339924cef719115d85bdf6c2e.tar.xz
forums-85055ac97fa57ca339924cef719115d85bdf6c2e.zip
oh boy...
- Migrate code base to PHP 5.1+ git-svn-id: file:///svn/phpbb/trunk@8295 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/db/mssql.php')
-rw-r--r--phpBB/includes/db/mssql.php9
1 files changed, 1 insertions, 8 deletions
diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php
index b222588cf2..1e42abcce2 100644
--- a/phpBB/includes/db/mssql.php
+++ b/phpBB/includes/db/mssql.php
@@ -39,14 +39,7 @@ class dbal_mssql extends dbal
@ini_set('mssql.textlimit', 2147483647);
@ini_set('mssql.textsize', 2147483647);
- if (version_compare(PHP_VERSION, '5.1.0', '>=') || (version_compare(PHP_VERSION, '5.0.0-dev', '<=') && version_compare(PHP_VERSION, '4.4.1', '>=')))
- {
- $this->db_connect_id = ($this->persistency) ? @mssql_pconnect($this->server, $this->user, $sqlpassword, $new_link) : @mssql_connect($this->server, $this->user, $sqlpassword, $new_link);
- }
- else
- {
- $this->db_connect_id = ($this->persistency) ? @mssql_pconnect($this->server, $this->user, $sqlpassword) : @mssql_connect($this->server, $this->user, $sqlpassword);
- }
+ $this->db_connect_id = ($this->persistency) ? @mssql_pconnect($this->server, $this->user, $sqlpassword, $new_link) : @mssql_connect($this->server, $this->user, $sqlpassword, $new_link);
if ($this->db_connect_id && $this->dbname != '')
{