From 06fd6260d8d224f01ad76523b2597470965b58b1 Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Wed, 28 Sep 2005 07:11:37 +0000
Subject: [PATCH] removed unneeded variable

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

diff --git a/ChangeLog b/ChangeLog
index 397d93fc5..a4fa49cd9 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
-2005-09-26 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+2005-09-27 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+    * libraries/sql_query_form.lib.php: removed unneeded variable
+
+2005-09-27 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * libraries/sql_query_form.lib.php, db_details.php, server_sql.php
       tbl_properties.php, tbl_properties_structure.php, sql.php,
       querywindow.php, read_dump.php: moved all code for queryboxes into
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 5c1d2b8e9..5626b39be 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -143,10 +143,8 @@ function PMA_sqlQueryForm( $query = true, $display_tab = false ) {
     }
     
     // display uploads
-    if ( $display_tab === 'files' ) {
-        if ( $GLOBALS['is_upload'] ) {
-            PMA_sqlQueryFormUpload( $display_tab );
-        }
+    if ( $display_tab === 'files' && $GLOBALS['is_upload'] ) {
+        PMA_sqlQueryFormUpload();
     }
     
     // Bookmark Support
@@ -154,7 +152,7 @@ function PMA_sqlQueryForm( $query = true, $display_tab = false ) {
         if ( ! empty( $GLOBALS['cfg']['Bookmark'] )
           && $GLOBALS['cfg']['Bookmark']['db']
           && $GLOBALS['cfg']['Bookmark']['table'] ) {
-            PMA_sqlQueryFormBookmark( $display_tab );
+            PMA_sqlQueryFormBookmark();
         }
     }
     
@@ -372,9 +370,8 @@ function PMA_sqlQueryFormInsert( $query = '', $is_querywindow = false ) {
  * @uses    $GLOBALS['strVar']
  * @uses    count()
  * @uses    htmlspecialchars()
- * @param   string  $display_tab    current tab displayed if in querywindow
  */
-function PMA_sqlQueryFormBookmark( $display_tab = 'full' ) {
+function PMA_sqlQueryFormBookmark() {
     $bookmark_list = PMA_listBookmarks( 
         $GLOBALS['db'], $GLOBALS['cfg']['Bookmark'] );
     if ( count( $bookmark_list ) < 1 ) {
@@ -462,9 +459,8 @@ function PMA_sqlQueryFormBookmark( $display_tab = 'full' ) {
  * @uses    PMA_MYSQL_INT_VERSION
  * @uses    PMA_CSDROPDOWN_CHARSET
  * @uses    empty()
- * @param   string  $display_tab    current tab displayed if in querywindow
  */
-function PMA_sqlQueryFormUpload( $display_tab = 'full' ) {
+function PMA_sqlQueryFormUpload() {
     $errors = array ();
 
     $matcher = '@\.sql(\.(' . PMA_supportedDecompressions() . '))?$@'; // we allow only SQL here