Merge branch 'QA_4_3'

3 files changed, 6 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 2fbd57262c..b41d3fc374 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -72,6 +72,7 @@ phpMyAdmin - ChangeLog
 - bug #4604 Query history not being deleted
 - bug #4057 db/table query string parameters no longer work
 - bug #4605 Unseen messages in tracking
+- bug #4606 Tracking report export as SQL dump does not work
 
 4.2.12.0 (2014-11-20)
 - bug #4574 Blank/white page when JavaScript disabled
diff --git a/libraries/tbl_common.inc.php b/libraries/tbl_common.inc.php
index 6037548531..2fd76626fc 100644
--- a/libraries/tbl_common.inc.php
+++ b/libraries/tbl_common.inc.php
@@ -48,6 +48,8 @@ require_once './libraries/db_table_exists.lib.php';
 if (PMA_Tracker::isActive()
     && PMA_Tracker::isTracked($GLOBALS["db"], $GLOBALS["table"])
     && ! isset($_REQUEST['submit_deactivate_now'])
+    && ! (isset($_REQUEST['report_export'])
+    && $_REQUEST['export_type'] == 'sqldumpfile')
 ) {
     $temp_msg = '<a href="tbl_tracking.php' . $url_query . '">';
     $temp_msg .= sprintf(
@@ -57,7 +59,7 @@ if (PMA_Tracker::isActive()
     $temp_msg .= '</a>';
 
     $msg = PMA_Message::notice($temp_msg);
-    $msg->display();
+    PMA_Response::getInstance()->addHTML($msg->getDisplay());
 }
 
 ?>
diff --git a/libraries/tracking.lib.php b/libraries/tracking.lib.php
index 25d908a12b..4bee5bccc6 100644
--- a/libraries/tracking.lib.php
+++ b/libraries/tracking.lib.php
@@ -1097,14 +1097,13 @@ function PMA_exportAsFileDownload($entries)
         $dump .= $entry['statement'];
     }
     $filename = 'log_' . htmlspecialchars($_REQUEST['table']) . '.sql';
+    PMA_Response::getInstance()->disable();
     PMA_downloadHeader(
         $filename,
         'text/x-sql',
         /*overload*/mb_strlen($dump)
     );
-
-    $response = PMA_Response::getInstance();
-    $response->addHTML($dump);
+    echo $dump;
 
     exit();
 }