From b6c81d3f3f8b9e052931b42c702448cf1d374f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 10 Oct 2003 09:11:29 +0000
Subject: [PATCH] Fix PMA_getTableContentOld (bug #820932).

---
 ChangeLog                 | 3 +++
 libraries/export/sql.php3 | 8 +-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 71928fd7a..1bb7591a1 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-10-10 Michal Cihar  <nijel@users.sourceforge.net>
+    * libraries/export/sql.php3: Fix PMA_getTableContentOld (bug #820932).
+
 2003-10-07 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/russian*: updated, thanks to Artyom Rabzonov
 
diff --git a/libraries/export/sql.php3 b/libraries/export/sql.php3
index 57d08246c..45d8688c4 100644
--- a/libraries/export/sql.php3
+++ b/libraries/export/sql.php3
@@ -556,13 +556,7 @@ function PMA_getTableContentOld($db, $table, $crlf, $error_url, $sql_query)
              : ';';
     $buffer = '';
 
-    if (!empty($sql_query)) {
-        $local_query = $sql_query . $add_query;
-        PMA_mysql_select_db($db);
-    } else {
-        $local_query  = 'SELECT * FROM ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $add_query;
-    }
-    $result       = PMA_mysql_query($local_query) or PMA_mysqlDie('', $local_query, '', $error_url);
+    $result       = PMA_mysql_query($sql_query) or PMA_mysqlDie('', $sql_query, '', $error_url);
     $current_row  = 0;
     $fields_cnt   = mysql_num_fields($result);
     $rows_cnt     = mysql_num_rows($result);