diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-05-31 15:34:58 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-05-31 15:34:58 +0200 |
| commit | bafaf3700c0c59f7b942a93bd63ca5c2b70fa7ba (patch) | |
| tree | 0cb13b036ee983f6a24ed8b29a8ea30da2e58c49 | |
| parent | 4a5004781aeb8638a0993476c77035d5311500a8 (diff) | |
| parent | b10757ef144d501af578edd4e438a088ee07ccf0 (diff) | |
| download | forums-bafaf3700c0c59f7b942a93bd63ca5c2b70fa7ba.tar forums-bafaf3700c0c59f7b942a93bd63ca5c2b70fa7ba.tar.gz forums-bafaf3700c0c59f7b942a93bd63ca5c2b70fa7ba.tar.bz2 forums-bafaf3700c0c59f7b942a93bd63ca5c2b70fa7ba.tar.xz forums-bafaf3700c0c59f7b942a93bd63ca5c2b70fa7ba.zip | |
Merge branch 'develop-olympus' into develop
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
[ticket/10611] Filter out not existing database tables when making a backup.
[ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables().
[ticket/10611] Generate db_tools instance in acp_database module.
| -rw-r--r-- | phpBB/includes/acp/acp_database.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index e66fd850c6..ebcbd28a87 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -20,6 +20,7 @@ if (!defined('IN_PHPBB')) */ class acp_database { + var $db_tools; var $u_action; function main($id, $mode) @@ -27,6 +28,12 @@ class acp_database global $cache, $db, $user, $auth, $template, $table_prefix; global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx; + if (!class_exists('phpbb_db_tools')) + { + require($phpbb_root_path . 'includes/db/db_tools.' . $phpEx); + } + $this->db_tools = new phpbb_db_tools($db); + $user->add_lang('acp/database'); $this->tpl_name = 'acp_database'; @@ -49,7 +56,7 @@ class acp_database { case 'download': $type = request_var('type', ''); - $table = request_var('table', array('')); + $table = array_intersect($this->db_tools->sql_list_tables(), request_var('table', array(''))); $format = request_var('method', ''); $where = request_var('where', ''); @@ -172,8 +179,7 @@ class acp_database break; default: - include($phpbb_root_path . 'includes/functions_install.' . $phpEx); - $tables = get_tables($db); + $tables = $this->db_tools->sql_list_tables(); asort($tables); foreach ($tables as $table_name) { |