diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-02-17 22:24:15 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-02-17 22:24:15 +0100 |
| commit | 978b96cbf5559f2e3e5021afd551db9a2eeb6d9c (patch) | |
| tree | a904a8c3d6ea17d9cacacfb34528ab6652f5716e /phpBB/phpbb/db | |
| parent | b84dee2667a01314d04c389068c48ca87f8239b0 (diff) | |
| parent | f3d332b78f483687b95c8892b6d585886b75fe07 (diff) | |
| download | forums-978b96cbf5559f2e3e5021afd551db9a2eeb6d9c.tar forums-978b96cbf5559f2e3e5021afd551db9a2eeb6d9c.tar.gz forums-978b96cbf5559f2e3e5021afd551db9a2eeb6d9c.tar.bz2 forums-978b96cbf5559f2e3e5021afd551db9a2eeb6d9c.tar.xz forums-978b96cbf5559f2e3e5021afd551db9a2eeb6d9c.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/13570] Remove unnecessary ternary condition from mysqli driver
Diffstat (limited to 'phpBB/phpbb/db')
| -rw-r--r-- | phpBB/phpbb/db/driver/mysqli.php | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php index debc3cc523..d43e201526 100644 --- a/phpBB/phpbb/db/driver/mysqli.php +++ b/phpBB/phpbb/db/driver/mysqli.php @@ -34,8 +34,7 @@ class mysqli extends \phpbb\db\driver\mysql_base return $this->sql_error(''); } - // Mysqli extension supports persistent connection since PHP 5.3.0 - $this->persistency = (version_compare(PHP_VERSION, '5.3.0', '>=')) ? $persistency : false; + $this->persistency = $persistency; $this->user = $sqluser; // If persistent connection, set dbhost to localhost when empty and prepend it with 'p:' prefix |