From 9c993cdacd70e4b3991a268368d36c1581e78d4a Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 23 Mar 2006 18:01:43 +0000
Subject: [PATCH] bug #1401864, preparing for possible DROP VIEW clauses

---
 ChangeLog                        | 4 ++++
 db_operations.php                | 2 +-
 libraries/display_export.lib.php | 6 +++---
 tbl_properties_operations.php    | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6f266495c9..12e16f191f 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2006-03-23 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/display_export.lib.php, lang/*: start work for bug #1401864,
+      generation of DROP VIEW statements where appropriate
+
 2006-03-23 Michal Čihař  <michal@cihar.com>
     * libraries/import/sql.php: Fix handling of -- (bug #1453430).
 
diff --git a/db_operations.php b/db_operations.php
index 213e376740..1da4985f00 100644
--- a/db_operations.php
+++ b/db_operations.php
@@ -254,7 +254,7 @@ if (!$is_information_schema) {
             <?php echo $strCreateDatabaseBeforeCopying; ?></label><br />
         <input type="checkbox" name="drop_if_exists" value="true"
             id="checkbox_drop" style="vertical-align: middle" />
-        <label for="checkbox_drop"><?php echo $strStrucDrop; ?></label><br />
+        <label for="checkbox_drop"><?php echo sprintf($strAddClause, 'DROP TABLE'); ?></label><br />
         <input type="checkbox" name="sql_auto_increment" value="1"
             id="checkbox_auto_increment" style="vertical-align: middle" />
         <label for="checkbox_auto_increment">
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 675db26c76..e390eb4c6b 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -311,7 +311,7 @@ function show_checked_option() {
             id="checkbox_drop_database"
             <?php PMA_exportCheckboxCheck('sql_drop_database'); ?> />
         <label for="checkbox_drop_database">
-            <?php echo $strAddDropDatabase; ?></label>
+            <?php echo sprintf($strAddClause, 'DROP DATABASE'); ?></label>
     </fieldset>
 <?php } if ( ! $hide_structure ) { /* SQL structure */ ?>
     <fieldset>
@@ -330,13 +330,13 @@ function show_checked_option() {
         <input type="checkbox" name="drop" value="1" id="checkbox_dump_drop"
             <?php PMA_exportCheckboxCheck('sql_drop_table'); ?> />
         <label for="checkbox_dump_drop">
-            <?php echo $strStrucDrop; ?></label><br />
+            <?php echo sprintf($strAddClause, 'DROP TABLE'); ?></label><br />
 
         <input type="checkbox" name="if_not_exists" value="1"
             id="checkbox_dump_if_not_exists"
             <?php PMA_exportCheckboxCheck('sql_if_not_exists'); ?> />
         <label for="checkbox_dump_if_not_exists">
-            <?php echo $strAddIfNotExists; ?></label><br />
+            <?php echo sprintf($strAddClause, 'IF NOT EXISTS'); ?></label><br />
 
         <input type="checkbox" name="sql_auto_increment" value="1"
             id="checkbox_auto_increment"
diff --git a/tbl_properties_operations.php b/tbl_properties_operations.php
index b9ab590d8f..325f30b006 100644
--- a/tbl_properties_operations.php
+++ b/tbl_properties_operations.php
@@ -356,7 +356,7 @@ foreach ($dblist as $each_db) {
     <label for="radio_copy_dataonly"><?php echo $strDataOnly; ?></label><br />
 
     <input type="checkbox" name="drop_if_exists" value="true" id="checkbox_drop" />
-    <label for="checkbox_drop"><?php echo $strStrucDrop; ?></label><br />
+    <label for="checkbox_drop"><?php echo sprintf($strAddClause, 'DROP TABLE'); ?></label><br />
     <input type="checkbox" name="sql_auto_increment" value="1" id="checkbox_auto_increment" />
     <label for="checkbox_auto_increment"><?php echo $strAddAutoIncrement; ?></label><br />
     <?php
-- 
2.11.4.GIT