Merge branch 'QA_4_6'

1 files changed, 13 insertions, 0 deletions

diff --git a/import.php b/import.php
index 83bfa76fe0..9c252bb6ca 100644
--- a/import.php
+++ b/import.php
@@ -691,6 +691,19 @@ if ($go_sql) {
         // @todo: possibly refactor
         extract($analyzed_sql_results);
 
+        // Check if User is allowed to issue a 'DROP DATABASE' Statement
+        if (PMA_hasNoRightsToDropDatabase(
+            $analyzed_sql_results, $cfg['AllowUserDropDatabase'], $GLOBALS['is_superuser']
+        )) {
+            PMA\libraries\Util::mysqlDie(
+                __('"DROP DATABASE" statements are disabled.'),
+                '',
+                false,
+                $_SESSION['Import_message']['go_back_url']
+            );
+            return;
+        } // end if
+
         if ($table != $table_from_sql && !empty($table_from_sql)) {
             $table = $table_from_sql;
         }