1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-23 19:45:10 +01:00

Merge pull request #2590 from bantu/ticket/12707

[ticket/12707] Do not try to load 3.1 DBMS driver name as 3.0 driver.

* bantu/ticket/12707:
  [ticket/12707] Do not try to load 3.1 DBMS driver name as 3.0 driver.
This commit is contained in:
Joas Schilling 2014-06-14 13:32:51 +02:00
commit 88987306de

View File

@ -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;
}