Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Čihař <michal@cihar.com>2017-01-23 16:03:41 +0300
committerMichal Čihař <michal@cihar.com>2017-01-23 16:07:29 +0300
commit27fb0b58af920a017a12b5fa89c6e90195b58504 (patch)
treeb7e16567a38ac0dd9960a8b6d4aa6da4bca6cbdd /export.php
parentd6adb187b2d4be3004f8c38c87ac270e25aa979f (diff)
parente4bf53690679332c23d0ff2b4865ad844d60d996 (diff)
Merge branch 'QA_4_6'
Signed-off-by: Michal Čihař <michal@cihar.com>
Diffstat (limited to 'export.php')
-rw-r--r--export.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/export.php b/export.php
index d1317ff565..836bf4f8f2 100644
--- a/export.php
+++ b/export.php
@@ -277,12 +277,12 @@ if ($export_type == 'server') {
// Merge SQL Query aliases with Export aliases from
// export page, Export page aliases are given more
// preference over SQL Query aliases.
-$parser = new SqlParser\Parser($sql_query);
+$parser = new \PhpMyAdmin\SqlParser\Parser($sql_query);
$aliases = array();
if ((!empty($parser->statements[0]))
- && ($parser->statements[0] instanceof SqlParser\Statements\SelectStatement)
+ && ($parser->statements[0] instanceof \PhpMyAdmin\SqlParser\Statements\SelectStatement)
) {
- $aliases = SqlParser\Utils\Misc::getAliases($parser->statements[0], $db);
+ $aliases = \PhpMyAdmin\SqlParser\Utils\Misc::getAliases($parser->statements[0], $db);
}
if (!empty($_REQUEST['aliases'])) {
$aliases = PMA_mergeAliases($aliases, $_REQUEST['aliases']);