diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-02-13 12:09:40 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-02-13 12:09:40 +0100 |
| commit | e5104b5d53bdfce0cbbf575d6c02ff609d36d2de (patch) | |
| tree | 7983f5df3923ced4e2edee9527c01760145b1032 /phpBB/includes/functions_install.php | |
| parent | 4756fa5262d2f82904a4d8a51e8ce638dcbab0a3 (diff) | |
| parent | 50478e68b093c71022337469bfa04f27382a8efb (diff) | |
| download | forums-e5104b5d53bdfce0cbbf575d6c02ff609d36d2de.tar forums-e5104b5d53bdfce0cbbf575d6c02ff609d36d2de.tar.gz forums-e5104b5d53bdfce0cbbf575d6c02ff609d36d2de.tar.bz2 forums-e5104b5d53bdfce0cbbf575d6c02ff609d36d2de.tar.xz forums-e5104b5d53bdfce0cbbf575d6c02ff609d36d2de.zip | |
Merge pull request #3285 from MGaetan89/ticket/13497
[ticket/13497] Change get_tables() calls with $db_tools->sql_list_tables()
Diffstat (limited to 'phpBB/includes/functions_install.php')
| -rw-r--r-- | phpBB/includes/functions_install.php | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/phpBB/includes/functions_install.php b/phpBB/includes/functions_install.php index 4217617b53..8dacd25230 100644 --- a/phpBB/includes/functions_install.php +++ b/phpBB/includes/functions_install.php @@ -182,19 +182,6 @@ function dbms_select($default = '', $only_20x_options = false) } /** -* Get tables of a database -* -* @deprecated -*/ -function get_tables(&$db) -{ - $factory = new \phpbb\db\tools\factory(); - $db_tools = $factory->get($db); - - return $db_tools->sql_list_tables(); -} - -/** * Used to test whether we are able to connect to the database the user has specified * and identify any problems (eg there are already tables with the names we want to use * @param array $dbms should be of the format of an element of the array returned by {@link get_available_dbms get_available_dbms()} @@ -277,7 +264,9 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix, $temp_prefix = strtolower($table_prefix); $table_ary = array($temp_prefix . 'attachments', $temp_prefix . 'config', $temp_prefix . 'sessions', $temp_prefix . 'topics', $temp_prefix . 'users'); - $tables = get_tables($db); + $db_tools_factory = new \phpbb\db\tools\factory(); + $db_tools = $db_tools_factory->get($db); + $tables = $db_tools->sql_list_tables(); $tables = array_map('strtolower', $tables); $table_intersect = array_intersect($tables, $table_ary); |