mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 15:45:34 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github-bantu/ticket/10611' into develop-olympus

Browse Source 
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10611:
  [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.
This commit is contained in:
Nils Adermann 2012-05-31 15:34:48 +02:00
commit b10757ef14
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/includes/acp/acp_database.php
View File

@ -21,6 +21,7 @@ if (!defined('IN_PHPBB'))
*/ */
class acp_database class acp_database
{ {
var $db_tools;
var $u_action; var $u_action;
function main($id, $mode) function main($id, $mode)
@ -28,6 +29,12 @@ class acp_database
global $cache, $db, $user, $auth, $template, $table_prefix; global $cache, $db, $user, $auth, $template, $table_prefix;
global $config, $phpbb_root_path, $phpbb_admin_path, $phpEx; 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'); $user->add_lang('acp/database');
$this->tpl_name = 'acp_database'; $this->tpl_name = 'acp_database';
@ -50,7 +57,7 @@ class acp_database
{ {
case 'download': case 'download':
$type = request_var('type', ''); $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', ''); $format = request_var('method', '');
$where = request_var('where', ''); $where = request_var('where', '');
@ -173,8 +180,7 @@ class acp_database
break; break;
default: default:
include($phpbb_root_path . 'includes/functions_install.' . $phpEx); $tables = $this->db_tools->sql_list_tables();
$tables = get_tables($db);
asort($tables); asort($tables);
foreach ($tables as $table_name) foreach ($tables as $table_name)
{ {