From c6044d36b49ec8639cfd860938cb94000673b090 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 27 Sep 2005 18:30:18 +0000
Subject: [PATCH] Do not use strOr, drop file upload from normal SQL dialogs.

---
 ChangeLog                        |  2 ++
 libraries/sql_query_form.lib.php | 10 +---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6e0ecd5ee..2bdcf1f43 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,8 @@ $Source$
     * lang/hebrew, translators.html: New Hebrew translation, thanks to Hadar
       Porat - hpman28.
     * lang/*: Add missing messages, remove duplicates and no longer used.
+    * libraries/sql_query_form.lib.php: Do not use strOr, drop file upload
+      from normal SQL dialogs.
 
 2005-09-26 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/database_interface.lib.php: fixed bug in PMA_DBI_fetch_*()
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 16a704ed7..5311a947b 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -141,7 +141,7 @@ function PMA_sqlQueryForm( $query = true, $display_tab = false ) {
     }
     
     // display uploads
-    if ( $display_tab === 'full' || $display_tab === 'files' ) {
+    if ( $display_tab === 'files' ) {
         if ( $GLOBALS['is_upload'] ) {
             PMA_sqlQueryFormUpload( $display_tab );
         }
@@ -366,7 +366,6 @@ function PMA_sqlQueryFormInsert( $query = '', $is_querywindow = false ) {
  * @uses    $GLOBALS['strDelete']
  * @uses    $GLOBALS['strDocu']
  * @uses    $GLOBALS['strGo']
- * @uses    $GLOBALS['strOr']
  * @uses    $GLOBALS['strSubmit']
  * @uses    $GLOBALS['strVar']
  * @uses    count()
@@ -382,9 +381,6 @@ function PMA_sqlQueryFormBookmark( $display_tab = 'full' ) {
     
     echo '<fieldset>';
     echo '<legend>';
-    if ( $display_tab == 'full' ) {
-        echo '<em>' . $GLOBALS['strOr'] . '</em> ';
-    }
     echo $GLOBALS['strBookmarkQuery'] . '</legend>' . "\n";
     echo '<div class="formelement">';
     echo '<select name="id_bookmark">' . "\n";
@@ -451,7 +447,6 @@ function PMA_sqlQueryFormBookmark( $display_tab = 'full' ) {
  * @uses    $GLOBALS['strGo']
  * @uses    $GLOBALS['strGzip']
  * @uses    $GLOBALS['strLocationTextfile']
- * @uses    $GLOBALS['strOr']
  * @uses    $GLOBALS['strWebServerUploadDirectory']
  * @uses    $GLOBALS['strWebServerUploadDirectoryError']
  * @uses    $GLOBALS['allow_recoding']
@@ -500,9 +495,6 @@ function PMA_sqlQueryFormUpload( $display_tab = 'full' ) {
     // start output
     echo '<fieldset id="">';
     echo '<legend>';
-    if ( $display_tab == 'full' ) {
-        echo '<em>' . $GLOBALS['strOr'] . '</em> ';
-    }
     echo $GLOBALS['strLocationTextfile'] . '</legend>';
     echo '<div class="formelement">';
     echo '<input type="file" name="sql_file" class="textfield" /> ';