From 549e04d7f678e0da6748707f71d5222e4af1b434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 9 Jan 2013 12:53:32 +0100 Subject: [PATCH] Avoid double exporting of structure Debian bug #670734 --- libraries/export/htmlword.php | 5 +++++ libraries/export/latex.php | 5 +++++ libraries/export/odt.php | 5 +++++ libraries/export/texytext.php | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index 104165ede1..d402419f01 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -192,6 +192,11 @@ if (isset($plugin_list)) { { global $cfgRelation; + /* We do not export triggers */ + if ($export_mode == 'triggers') { + return true; + } + if (! PMA_exportOutputHandler('

' . __('Table structure for table') . ' ' . htmlspecialchars($table) . '

')) { return false; } diff --git a/libraries/export/latex.php b/libraries/export/latex.php index 5963974d69..b8ece253a4 100644 --- a/libraries/export/latex.php +++ b/libraries/export/latex.php @@ -334,6 +334,11 @@ if (isset($plugin_list)) { { global $cfgRelation; + /* We do not export triggers */ + if ($export_mode == 'triggers') { + return true; + } + /** * Get the unique keys in the table */ diff --git a/libraries/export/odt.php b/libraries/export/odt.php index d6f6936b76..01d5714c95 100644 --- a/libraries/export/odt.php +++ b/libraries/export/odt.php @@ -244,6 +244,11 @@ if (isset($plugin_list)) { { global $cfgRelation; + /* We do not export triggers */ + if ($export_mode == 'triggers') { + return true; + } + /* Heading */ $GLOBALS['odt_buffer'] .= '' . __('Table structure for table') . ' ' . htmlspecialchars($table) . ''; diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php index ba8e05f7be..222b394fac 100644 --- a/libraries/export/texytext.php +++ b/libraries/export/texytext.php @@ -174,6 +174,11 @@ if (isset($plugin_list)) { { global $cfgRelation; + /* We do not export triggers */ + if ($export_mode == 'triggers') { + return true; + } + if (! PMA_exportOutputHandler('== ' . __('Table structure for table') . ' ' .$table . "\n\n")) { return false; }