From 04d72a829188414bd77861d894a768558b0a01bd Mon Sep 17 00:00:00 2001 From: Saksham Gupta Date: Mon, 22 Mar 2021 22:23:30 +0530 Subject: [PATCH] Fix #16703 No SQL option on Export of rows from a table Signed-off-by: Saksham Gupta Add null fallback Signed-off-by: Saksham Gupta Update yarn.lock --- libraries/classes/Controllers/Database/ExportController.php | 2 +- libraries/classes/Controllers/Server/ExportController.php | 2 +- libraries/classes/Controllers/Table/ExportController.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/classes/Controllers/Database/ExportController.php b/libraries/classes/Controllers/Database/ExportController.php index 23bfbe5efd..e51da12b7a 100644 --- a/libraries/classes/Controllers/Database/ExportController.php +++ b/libraries/classes/Controllers/Database/ExportController.php @@ -140,7 +140,7 @@ final class ExportController extends AbstractController $export_type = 'database'; } - $GLOBALS['single_table'] = $_POST['single_table'] ?? $_GET['single_table'] ?? null; + $GLOBALS['single_table'] = $_POST['single_table'] ?? $_GET['single_table'] ?? $GLOBALS['single_table'] ?? null; $exportList = Plugins::getExport($export_type, isset($GLOBALS['single_table'])); diff --git a/libraries/classes/Controllers/Server/ExportController.php b/libraries/classes/Controllers/Server/ExportController.php index 50a3493eb5..d793e8336f 100644 --- a/libraries/classes/Controllers/Server/ExportController.php +++ b/libraries/classes/Controllers/Server/ExportController.php @@ -64,7 +64,7 @@ final class ExportController extends AbstractController $unlim_num_rows = 0; } - $GLOBALS['single_table'] = $_POST['single_table'] ?? $_GET['single_table'] ?? null; + $GLOBALS['single_table'] = $_POST['single_table'] ?? $_GET['single_table'] ?? $GLOBALS['single_table'] ?? null; $exportList = Plugins::getExport('server', isset($GLOBALS['single_table'])); diff --git a/libraries/classes/Controllers/Table/ExportController.php b/libraries/classes/Controllers/Table/ExportController.php index 8c13f6f662..c38ce0df3b 100644 --- a/libraries/classes/Controllers/Table/ExportController.php +++ b/libraries/classes/Controllers/Table/ExportController.php @@ -107,7 +107,7 @@ class ExportController extends AbstractController $unlim_num_rows = 0; } - $GLOBALS['single_table'] = $_POST['single_table'] ?? $_GET['single_table'] ?? null; + $GLOBALS['single_table'] = $_POST['single_table'] ?? $_GET['single_table'] ?? $GLOBALS['single_table'] ?? null; $exportList = Plugins::getExport('table', isset($GLOBALS['single_table']));