From 038b43e8f53fa49647f9780a6a16dd2bead16ba0 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Tue, 9 Aug 2022 11:32:18 +0800
Subject: [PATCH]  * adjust for upgrade.

---
 module/upgrade/control.php             |  4 +--
 module/upgrade/view/afterexec.html.php | 42 ++++++++++++++++----------
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index 1e154e35fb..db3875f0f5 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -933,9 +933,7 @@ class upgrade extends control
         if($nextTable and stripos($nextTable->Name, 'searchindex') !== false)
         {
             $mysqlVersion = $this->loadModel('install')->getMysqlVersion();
-            if($mysqlVersion < 5.6) return print(json_encode($response));
-
-            $nextTable = $stmt->fetch();
+            if($mysqlVersion < 5.6) $nextTable = $stmt->fetch();
         }
 
         $tableName = $table->Name;
diff --git a/module/upgrade/view/afterexec.html.php b/module/upgrade/view/afterexec.html.php
index 401336150c..f3b82cd10c 100644
--- a/module/upgrade/view/afterexec.html.php
+++ b/module/upgrade/view/afterexec.html.php
@@ -98,27 +98,37 @@ function changeEngine()
 {
     var link     = '<?php echo inlink('ajaxChangeTableEngine')?>';
     var $infoBox = $('#changeEngineBox .info');
-    $.getJSON(link, function(response)
+    $.ajax(
     {
-        if(response == null)
+        type: "GET",
+        url: link,
+        success: function(response)
         {
-            changeEngineFinish = true;
-            finishedShow();
-        }
-        else if(response.result == 'finished')
+            response = JSON.parse(response);
+            if(response == null)
+            {
+                changeEngineFinish = true;
+                finishedShow();
+            }
+            else if(response.result == 'finished')
+            {
+                changeEngineFinish = true;
+                $infoBox.prepend("<div class='text-success'>" + response.message + "</div>");
+                finishedShow();
+            }
+            else
+            {
+                if($infoBox.find('.' + response.table).length == 0) $infoBox.prepend("<div class='text-success " + response.table + "'></div>");
+                $infoBox.find('.' + response.table).html(response.message);
+                if(response.next) $infoBox.prepend("<div class='text-success " + response.next + "'>" + response.nextMessage + "</div>");
+                changeEngine();
+            }
+        },
+        error: function()
         {
-            changeEngineFinish = true;
-            $infoBox.prepend("<div class='text-success'>" + response.message + "</div>");
-            finishedShow();
-        }
-        else
-        {
-            if($infoBox.find('.' + response.table).length == 0) $infoBox.prepend("<div class='text-success " + response.table + "'></div>");
-            $infoBox.find('.' + response.table).html(response.message);
-            if(response.next) $infoBox.prepend("<div class='text-success " + response.next + "'>" + response.nextMessage + "</div>");
             changeEngine();
         }
-    });
+    })
 }
 <?php endif;?>
 <?php if(isset($needProcess['updateFile'])):?>