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 | f3d332b78f483687b95c8892b6d585886b75fe07 (patch) | |
| tree | 07985a69ffa02e1bac47c415cd6110f0b8c16cd7 /phpBB/phpbb/db | |
| parent | 6322970766bd9fa78327fa2ca6a6a43d73b680ee (diff) | |
| parent | f23d2ec42fea8f22366e4ecd644fabcf4a36c5b0 (diff) | |
| download | forums-f3d332b78f483687b95c8892b6d585886b75fe07.tar forums-f3d332b78f483687b95c8892b6d585886b75fe07.tar.gz forums-f3d332b78f483687b95c8892b6d585886b75fe07.tar.bz2 forums-f3d332b78f483687b95c8892b6d585886b75fe07.tar.xz forums-f3d332b78f483687b95c8892b6d585886b75fe07.zip | |
Merge pull request #3411 from Senky/ticket/13570
[ticket/13570] Mysqli extension supports persistent connection since PHP 5.3.0
* Senky/ticket/13570:
[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 2ed08211ad..c0ddfbf76c 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 |