bug #4606 Tracking report export as SQL dump does not work

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
phpmyadmin · Nov 25, 2014 · 14a7726 · 14a7726
1 parent 8607de6
commit 14a7726
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -5,6 +5,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
@@ -48,6 +48,8 @@
 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 @@
     $temp_msg .= '</a>';
 
     $msg = PMA_Message::notice($temp_msg);
-    $msg->display();
+    PMA_Response::getInstance()->addHTML($msg->getDisplay());
 }
 
 ?>
diff --git a/libraries/tbl_tracking.lib.php b/libraries/tbl_tracking.lib.php
@@ -1115,10 +1115,10 @@ function PMA_exportAsFileDownload($entries)
         $dump .= $entry['statement'];
     }
     $filename = 'log_' . htmlspecialchars($_REQUEST['table']) . '.sql';
-    PMA_downloadHeader($filename, 'text/x-sql', strlen($dump));
 
-    $response = PMA_Response::getInstance();
-    $response->addHTML($dump);
+    PMA_Response::getInstance()->disable();
+    PMA_downloadHeader($filename, 'text/x-sql', strlen($dump));
+    echo $dump;
 
     exit();
 }