Merge branch 'master' into useNamespaces_master

1 files changed, 24 insertions, 2 deletions

diff --git a/tbl_export.php b/tbl_export.php
index ca2e60d1ae..cfa19fb42c 100644
--- a/tbl_export.php
+++ b/tbl_export.php
@@ -175,5 +175,27 @@ if (! empty($sql_query)) {
     echo PMA\libraries\Util::getMessage(PMA\libraries\Message::success());
 }
 
-$export_type = 'table';
-require_once 'libraries/display_export.inc.php';
+require_once 'libraries/display_export.lib.php';
+
+if (! isset($sql_query)) {
+    $sql_query = '';
+}
+if (! isset($num_tables)) {
+    $num_tables = 0;
+}
+if (! isset($num_tables)) {
+    $num_tables = 0;
+}
+if (! isset($unlim_num_rows)) {
+    $unlim_num_rows = 0;
+}
+if (! isset($multi_values)) {
+    $multi_values = '';
+}
+$response = PMA_Response::getInstance();
+$response->addHTML(
+    PMA_getExportDisplay(
+        'table', $db, $table, $sql_query, $num_tables,
+        $unlim_num_rows, $multi_values
+    )
+);