diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-06-25 13:31:31 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-12-28 22:36:25 +0100 |
| commit | eda9fbbb6363cad0f2035b7a1f9fafe27f23832b (patch) | |
| tree | c023293935fd985b304c7047337fbbf236ea8644 /phpBB/includes/db | |
| parent | 1e59666ee32fb00c709644f1f66d3c0b662f32a0 (diff) | |
| download | forums-eda9fbbb6363cad0f2035b7a1f9fafe27f23832b.tar forums-eda9fbbb6363cad0f2035b7a1f9fafe27f23832b.tar.gz forums-eda9fbbb6363cad0f2035b7a1f9fafe27f23832b.tar.bz2 forums-eda9fbbb6363cad0f2035b7a1f9fafe27f23832b.tar.xz forums-eda9fbbb6363cad0f2035b7a1f9fafe27f23832b.zip | |
[ticket/9574] Remove conditional PHP<5.2 code
There is a large amount of conditional code for PHP < 5.2 that can be
removed with phpBB 3.1.
PHPBB3-9574
Diffstat (limited to 'phpBB/includes/db')
| -rw-r--r-- | phpBB/includes/db/mssql.php | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/phpBB/includes/db/mssql.php b/phpBB/includes/db/mssql.php index 1188e56ebe..386b0a9a23 100644 --- a/phpBB/includes/db/mssql.php +++ b/phpBB/includes/db/mssql.php @@ -41,14 +41,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 != '') { |