From 71e6f68763b59317297a00a57940230c864c9a23 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 28 Nov 2009 13:11:13 +0000
Subject: [PATCH] bug [history] QueryHistoryDB is not respected

---
 ChangeLog                  | 1 +
 libraries/relation.lib.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f44c5a4b6..c614f194e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 3.2.5.0 (not yet released)
 - patch #2903400 [bookmarks] Status of bookmark table, 
   thanks to Virsacer - virsacer 
+- bug [history] QueryHistoryDB is not respected
 
 3.2.4.0 (not yet released)
 - bug [engines] Innodb_buffer_pool_pages_latched no longer returned in status
diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index aef031fbb..7e05a07a0 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -682,6 +682,7 @@ function PMA_setDbComment($db, $comment = '')
  * Set a SQL history entry
  *
  * @uses    $_SESSION['sql_history']
+ * @uses    $cfg['QueryHistoryDB']
  * @uses    $cfg['QueryHistoryMax']
  * @uses    PMA_getRelationsParam()
  * @uses    PMA_query_as_controluser()
@@ -725,7 +726,7 @@ function PMA_setHistory($db, $table, $username, $sqlquery)
         array_shift($_SESSION['sql_history']);
     }
 
-    if (! $cfgRelation['historywork']) {
+    if (! $cfgRelation['historywork'] || ! $GLOBALS['cfg']['QueryHistoryDB']) {
         return;
     }