diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-09-01 13:33:05 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-09-01 13:33:05 +0200 |
| commit | d6139846607a4fe3a13d5863b3fa6a52b1fe3c10 (patch) | |
| tree | 17b90cee413451f1b4a2d85762db6cc3cc946b1c | |
| parent | dcafa6a7110081c9b2611219ccbbfb10788503b6 (diff) | |
| parent | 4db585a4cb2e5359074a82ef088574609155294b (diff) | |
| download | forums-d6139846607a4fe3a13d5863b3fa6a52b1fe3c10.tar forums-d6139846607a4fe3a13d5863b3fa6a52b1fe3c10.tar.gz forums-d6139846607a4fe3a13d5863b3fa6a52b1fe3c10.tar.bz2 forums-d6139846607a4fe3a13d5863b3fa6a52b1fe3c10.tar.xz forums-d6139846607a4fe3a13d5863b3fa6a52b1fe3c10.zip | |
Merge branch '3.2.x' into 3.3.x
| -rw-r--r-- | phpBB/adm/style/acp_database.html | 6 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_database.php | 10 |
2 files changed, 3 insertions, 13 deletions
diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index ed0f4dd453..cc0b57b411 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -68,12 +68,6 @@ <!-- END methods --></dd> </dl> <dl> - <dt><label for="where">{L_ACTION}{L_COLON}</label></dt> - <dd> - <label><input id="where" type="radio" class="radio" name="where" value="store" checked="checked" /> {L_STORE_LOCAL}</label> - </dd> - </dl> - <dl> <dt><label for="table">{L_TABLE_SELECT}{L_COLON}</label></dt> <dd><select id="table" name="table[]" size="10" multiple="multiple"> <!-- BEGIN tables --> diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index c33c2e4d6f..677fce7217 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -58,7 +58,6 @@ class acp_database $type = $request->variable('type', ''); $table = array_intersect($this->db_tools->sql_list_tables(), $request->variable('table', array(''))); $format = $request->variable('method', ''); - $where = $request->variable('where', ''); if (!count($table)) { @@ -70,12 +69,9 @@ class acp_database trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); } - $store = $structure = $schema_data = false; - - if ($where == 'store') - { - $store = true; - } + $store = true; + $structure = false; + $schema_data = false; if ($type == 'full' || $type == 'structure') { |