diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-14 13:33:11 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-14 13:33:11 +0200 |
| commit | b64837a29bbb6563b1a2f4c4112bd893c24ff0bf (patch) | |
| tree | 80db97f95ae459ba128ba4f2e64e6a08f09c5144 /phpBB/includes/functions.php | |
| parent | 00b0172962ec1a8628bce7502cfe4b4372266d68 (diff) | |
| parent | 88987306de00636dfadc7a4dad08048226eeaa59 (diff) | |
| download | forums-b64837a29bbb6563b1a2f4c4112bd893c24ff0bf.tar forums-b64837a29bbb6563b1a2f4c4112bd893c24ff0bf.tar.gz forums-b64837a29bbb6563b1a2f4c4112bd893c24ff0bf.tar.bz2 forums-b64837a29bbb6563b1a2f4c4112bd893c24ff0bf.tar.xz forums-b64837a29bbb6563b1a2f4c4112bd893c24ff0bf.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12707] Do not try to load 3.1 DBMS driver name as 3.0 driver.
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 9d94ef2be4..3d0a4761f3 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -5311,7 +5311,7 @@ function phpbb_convert_30_dbms_to_31($dbms) // true for mysqli class. // However, per the docblock any valid 3.1 driver name should be // recognized by this function, and have priority over 3.0 dbms. - if (class_exists('phpbb\db\driver\\' . $dbms)) + if (strpos($dbms, 'phpbb\db\driver') === false && class_exists('phpbb\db\driver\\' . $dbms)) { return 'phpbb\db\driver\\' . $dbms; } |