Merge branch 'sgm_upgrade' into 'master'

* Fix upgrade error.

See merge request easycorp/zentaopms!2185

module/upgrade/control.php

@@ -721,7 +721,7 @@ class upgrade extends control
             $this->view->title      = $this->lang->upgrade->result;
             $this->view->position[] = $this->lang->upgrade->common;
 
-            $needProcess = $this->upgrade->checkProcess($fromVersion);
+            $needProcess = $this->upgrade->checkProcess();
             $this->view->needProcess = $needProcess;
             $this->view->fromVersion = $fromVersion;
             $this->display();

module/upgrade/view/afterexec.html.php

@@ -46,6 +46,11 @@
   </div>
 </div>
 <script>
+$(function()
+{
+    $.get('<?php echo inlink('afterExec', "fromVersion=$fromVersion&processed=yes")?>');
+})
+
 <?php
 foreach($needProcess as $processKey => $value) echo 'var ' . $processKey . "Finish = false;\n";
 if(isset($needProcess['updateFile'])):?>