diff options
| author | Madhura Jayaratne <madhura.cj@gmail.com> | 2016-03-14 14:16:07 +0300 |
|---|---|---|
| committer | Madhura Jayaratne <madhura.cj@gmail.com> | 2016-03-14 14:16:07 +0300 |
| commit | c6d2f0012cd3447c652a580ef7067b56b8c866a2 (patch) | |
| tree | 9a7984f6c362f489da1b858cf58f7000e19fc254 /export.php | |
| parent | 41134bcd6be1ee6667535baf5a0d871463d994ed (diff) | |
| parent | c8e51a1b5922ebbde41f80bf88e5fb5f2f6815d6 (diff) | |
Merge branch 'QA_4_6'
Diffstat (limited to 'export.php')
| -rw-r--r-- | export.php | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/export.php b/export.php index ca0b954099..76bf32461a 100644 --- a/export.php +++ b/export.php @@ -288,15 +288,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']; } /** |