Merge pull request #1724 from nisargjhaveri/issue_4948

Fix bug#4948

libraries/import.lib.php

@@ -135,8 +135,7 @@ function PMA_importRunQuery($sql = '', $full = '', $controluser = false,
                 && ! $error
                 && ((! empty($import_run_buffer['sql'])
                 && preg_match($pattern, $import_run_buffer['sql']))
-                || ($executed_queries == 1
-                && ! isset($_REQUEST['fk_checks'])))
+                || ($executed_queries == 1))
             ) {
                 $go_sql = true;
                 if (! $sql_query_disabled) {

libraries/sql.lib.php

@@ -2086,6 +2086,9 @@ function PMA_executeQueryAndGetQueryResponse($analyzed_sql_results,
 
     include_once 'libraries/DisplayResults.class.php';
 
+    // Hnadle disable/enable foreign key checks
+    $default_fk_check = PMA_Util::handleDisableFKCheckInit();
+
     // Handle remembered sorting order, only for single table query
     // Handling is not required when it's a union query
     // (the parser never sets the 'union' key to 0)
@@ -2163,6 +2166,9 @@ function PMA_executeQueryAndGetQueryResponse($analyzed_sql_results,
         );
     }
 
+    // Hnadle disable/enable foreign key checks
+    PMA_Util::handleDisableFKCheckCleanup($default_fk_check);
+
     return $html_output;
 }