nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #1555760, export default parameter broken

Browse Source
This commit is contained in:
Marc Delisle
2006-09-11 21:27:21 +00:00
parent 75acdfeb69
commit 2f1c30d257
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$Source$ $Source$
2006-09-11 Marc Delisle <lem9@users.sourceforge.net>
* libraries/export/sql.php: bug #1555760, export default parameter broken
2006-09-09 Marc Delisle <lem9@users.sourceforge.net> 2006-09-09 Marc Delisle <lem9@users.sourceforge.net>
* libraries/common.lib.php: bug #1554166, magic_quotes_runtime * libraries/common.lib.php: bug #1554166, magic_quotes_runtime

6
libraries/export/sql.php
View File

@@ -61,7 +61,7 @@ if (isset($plugin_list)) {
$drop_clause = 'DROP TABLE'; $drop_clause = 'DROP TABLE';
} }
$plugin_list['sql']['options'][] = $plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' => 'drop', 'text' => sprintf($GLOBALS['strAddClause'], $drop_clause)); array('type' => 'bool', 'name' => 'drop_table', 'text' => sprintf($GLOBALS['strAddClause'], $drop_clause));
$plugin_list['sql']['options'][] = $plugin_list['sql']['options'][] =
array('type' => 'bool', 'name' => 'if_not_exists', 'text' => sprintf($GLOBALS['strAddClause'], 'IF NOT EXISTS')); array('type' => 'bool', 'name' => 'if_not_exists', 'text' => sprintf($GLOBALS['strAddClause'], 'IF NOT EXISTS'));
$plugin_list['sql']['options'][] = $plugin_list['sql']['options'][] =
@@ -342,7 +342,7 @@ function PMA_exportDBFooter($db)
*/ */
function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false) function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false)
{ {
global $sql_drop; global $sql_drop_table;
global $sql_backquotes; global $sql_backquotes;
global $cfgRelation; global $cfgRelation;
global $sql_constraints; global $sql_constraints;
@@ -384,7 +384,7 @@ function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false)
$schema_create .= $new_crlf; $schema_create .= $new_crlf;
if (!empty($sql_drop)) { if (!empty($sql_drop_table)) {
if (PMA_Table::_isView($db,$table)) { if (PMA_Table::_isView($db,$table)) {
$drop_clause = 'DROP VIEW'; $drop_clause = 'DROP VIEW';
} else { } else {