From 1bab8bfeeaf508cbe5fb8ff7ed1b910b7faca3eb Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 2 Sep 2013 07:56:08 -0400 Subject: [PATCH] The rendering of "view output as text" should not be affected by the fix for the memory problems in export --- export.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/export.php b/export.php index 54ad70ddd2..065c0fbbd3 100644 --- a/export.php +++ b/export.php @@ -6,10 +6,17 @@ * @package PhpMyAdmin */ +/** + * If we are sending the export file (as opposed to just displaying it + * as text), we have to bypass the usual PMA_Response mechanism + */ +if ($_POST['output_format'] == 'sendit') { + define('PMA_BYPASS_GET_INSTANCE', 1); +} + /** * Get the variables sent or posted to this script and a core script */ -define('PMA_BYPASS_GET_INSTANCE', 1); require_once 'libraries/common.inc.php'; require_once 'libraries/zip.lib.php'; require_once 'libraries/plugin_interface.lib.php';