Merge branch 'QA_4_6'

Conflicts:
	po/sk.po

1 files changed, 8 insertions, 6 deletions

diff --git a/tbl_export.php b/tbl_export.php
index e8e7230cc0..fd6989d82e 100644
--- a/tbl_export.php
+++ b/tbl_export.php
@@ -67,13 +67,15 @@ if (! empty($sql_query)) {
         }
 
         // Rebuilding the SELECT and FROM clauses.
-        $replaces = array(
-            array(
-                'FROM', 'FROM ' . SqlParser\Components\ExpressionArray::build(
-                    $parser->statements[0]->from
+        if (count($parser->statements[0]->from) > 0) {
+            $replaces = array(
+                array(
+                    'FROM', 'FROM ' . SqlParser\Components\ExpressionArray::build(
+                        $parser->statements[0]->from
+                    ),
                 ),
-            ),
-        );
+            );
+        }
 
         // Checking if the WHERE clause has to be replaced.
         if ((!empty($where_clause)) && (is_array($where_clause))) {