From 8d1a0f2d689dbff51e0de0d1a0a6f3d20ac24ce2 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Tue, 26 Nov 2013 06:44:05 +0530
Subject: [PATCH 1/2] Use a better variable name ($result variable is used for
 storing query execution result as well)

---
 import.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/import.php b/import.php
index 1b3205aa8d..3c3281580e 100644
--- a/import.php
+++ b/import.php
@@ -423,12 +423,12 @@ if ($import_file != 'none' && ! $error) {
                  * Load interface for zip extension.
                  */
                 include_once 'libraries/zip_extension.lib.php';
-                $result = PMA_getZipContents($import_file);
-                if (! empty($result['error'])) {
-                    $message = PMA_Message::rawError($result['error']);
+                $zipResult = PMA_getZipContents($import_file);
+                if (! empty($zipResult['error'])) {
+                    $message = PMA_Message::rawError($zipResult['error']);
                     $error = true;
                 } else {
-                    $import_text = $result['data'];
+                    $import_text = $zipResult['data'];
                 }
             } else {
                 $message = PMA_Message::error(

From 92b6639a9e9b0f457c0fc38cd5e27ffab3d179b4 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Tue, 26 Nov 2013 06:46:02 +0530
Subject: [PATCH 2/2] bug #4161 - Fix PHP errors

---
 import.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/import.php b/import.php
index 3c3281580e..157c5488d4 100644
--- a/import.php
+++ b/import.php
@@ -625,7 +625,7 @@ if ($go_sql) {
 
     PMA_executeQueryAndSendQueryResponse(
         $analyzed_sql_results, false, $db, $table, null, $import_text, null,
-        false, null,
+        $analyzed_sql_results['is_affected'], null,
         null, null, null, $goto, $pmaThemeImage, null, null, null, $sql_query,
         null, null
     );