Fix #12092 Rename exported databases/tables doesn't seem to work

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>

1 files changed, 5 insertions, 9 deletions

diff --git a/export.php b/export.php
index c88f6c89f6..785972b7dd 100644
--- a/export.php
+++ b/export.php
@@ -285,15 +285,11 @@ if (!defined('TESTSUITE')) {
     if ((!empty($parser->statements[0]))
         && ($parser->statements[0] instanceof SqlParser\Statements\SelectStatement)
     ) {
-        if (!empty($_REQUEST['aliases'])) {
-            $aliases = PMA_mergeAliases(
-                SqlParser\Utils\Misc::getAliases($parser->statements[0], $db),
-                $_REQUEST['aliases']
-            );
-            $_SESSION['tmpval']['aliases'] = $_REQUEST['aliases'];
-        } else {
-            $aliases = SqlParser\Utils\Misc::getAliases($parser->statements[0], $db);
-        }
+        $aliases = SqlParser\Utils\Misc::getAliases($parser->statements[0], $db);
+    }
+    if (!empty($_REQUEST['aliases'])) {
+        $aliases = PMA_mergeAliases($aliases, $_REQUEST['aliases']);
+        $_SESSION['tmpval']['aliases'] = $_REQUEST['aliases'];
     }
 
     /**