diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-07-04 21:08:20 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-07-04 21:08:20 +0200 |
| commit | 53ff23671c2706c13bbe8ecca6b29b3c3456768b (patch) | |
| tree | 9c53dc59698da5b4750e536f20552ffe088931c3 /phpBB/phpbb/db/tools.php | |
| parent | 86e21a9b261d6239487c626b7e9c9f462ceab611 (diff) | |
| parent | ff6e026a403a622bd1aa498bff396a737735faed (diff) | |
| download | forums-53ff23671c2706c13bbe8ecca6b29b3c3456768b.tar forums-53ff23671c2706c13bbe8ecca6b29b3c3456768b.tar.gz forums-53ff23671c2706c13bbe8ecca6b29b3c3456768b.tar.bz2 forums-53ff23671c2706c13bbe8ecca6b29b3c3456768b.tar.xz forums-53ff23671c2706c13bbe8ecca6b29b3c3456768b.zip | |
Merge remote-tracking branch 'github-nicofuma/ticket/12446' into develop-ascraeus
* github-nicofuma/ticket/12446:
[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
Diffstat (limited to 'phpBB/phpbb/db/tools.php')
| -rw-r--r-- | phpBB/phpbb/db/tools.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/phpbb/db/tools.php b/phpBB/phpbb/db/tools.php index 2ec46ed239..18defc4535 100644 --- a/phpBB/phpbb/db/tools.php +++ b/phpBB/phpbb/db/tools.php @@ -323,7 +323,7 @@ class tools $this->dbms_type_map = self::get_dbms_type_map(); // Determine mapping database type - switch ($this->db->sql_layer) + switch ($this->db->get_sql_layer()) { case 'mysql': $this->sql_layer = 'mysql_40'; @@ -354,7 +354,7 @@ class tools break; default: - $this->sql_layer = $this->db->sql_layer; + $this->sql_layer = $this->db->get_sql_layer(); break; } } @@ -377,7 +377,7 @@ class tools */ function sql_list_tables() { - switch ($this->db->sql_layer) + switch ($this->db->get_sql_layer()) { case 'mysql': case 'mysql4': @@ -711,7 +711,7 @@ class tools $sqlite = false; // For SQLite we need to perform the schema changes in a much more different way - if (($this->db->sql_layer == 'sqlite' || $this->db->sql_layer == 'sqlite3') && $this->return_statements) + if (($this->db->get_sql_layer() == 'sqlite' || $this->db->get_sql_layer() == 'sqlite3') && $this->return_statements) { $sqlite_data = array(); $sqlite = true; |