From: Jakub Vrana <jakub@vrana.cz>
Date: Wed, 17 Apr 2013 15:48:59 +0000 (-0700)
Subject: Respect global errors in dump
X-Git-Tag: v3.6.4~14
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=7af362554ab70cae37c65222e96d07f83cd964e1;p=adminer.git

Respect global errors in dump
---

diff --git a/adminer/dump.inc.php b/adminer/dump.inc.php
index 76371a80..4118f375 100644
--- a/adminer/dump.inc.php
+++ b/adminer/dump.inc.php
@@ -1,7 +1,7 @@
 <?php
 $TABLE = $_GET["dump"];
 
-if ($_POST) {
+if ($_POST && !$error) {
 	$cookie = "";
 	foreach (array("output", "format", "db_style", "routines", "events", "table_style", "auto_increment", "triggers", "data_style") as $key) {
 		$cookie .= "&$key=" . urlencode($_POST[$key]);
@@ -106,7 +106,7 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 	exit;
 }
 
-page_header(lang('Export'), "", ($_GET["export"] != "" ? array("table" => $_GET["export"]) : array()), DB);
+page_header(lang('Export'), $error, ($_GET["export"] != "" ? array("table" => $_GET["export"]) : array()), DB);
 ?>
 
 <form action="" method="post">
@@ -140,6 +140,7 @@ echo "<tr><th>" . lang('Data') . "<td>" . html_select('data_style', $data_style,
 ?>
 </table>
 <p><input type="submit" value="<?php echo lang('Export'); ?>">
+<input type="hidden" name="token" value="<?php echo $token; ?>">
 
 <table cellspacing="0">
 <?php