Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3

2014-11-22 13:17:54 +01:00 · 2014-11-22 13:17:54 +01:00 · 42bf15ea70
commit 42bf15ea70
parent 4bade1edfd 11b1dd67fb
2 changed files with 4 additions and 0 deletions
--- a/1
+++ b/1
@ -66,6 +66,7 @@ phpMyAdmin - ChangeLog
 + rfe #1537 PHP OpenSSL support for cookie encryption/decryption

 4.2.13.0 (not yet released)
+- bug #4604 Query history not being deleted

 4.2.12.0 (2014-11-20)
 - bug #4574 Blank/white page when JavaScript disabled
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@ -969,6 +969,9 @@ function PMA_setHistory($db, $table, $username, $sqlquery)
               NOW(),
               \'' . PMA_Util::sqlAddSlashes($sqlquery) . '\')'
    );
+
+    PMA_purgeHistory($username);
+
 } // end of 'PMA_setHistory()' function

 /**