From 6989db296353926c1a8a0c90278dd9b9b1990d53 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 28 Jul 2014 02:05:40 +0000
Subject: [PATCH]  * finish task #1980.

---
 module/upgrade/control.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/module/upgrade/control.php b/module/upgrade/control.php
index a3c5333b65..8d0be04273 100644
--- a/module/upgrade/control.php
+++ b/module/upgrade/control.php
@@ -52,6 +52,9 @@ class upgrade extends control
         $this->view->confirm     = $this->upgrade->getConfirm($this->post->fromVersion);
         $this->view->fromVersion = $this->post->fromVersion;
 
+        /* When sql is empty then skip it. */
+        if(empty($this->view->confirm)) $this->locate(inlink('execute', "fromVersion={$this->post->fromVersion}"));
+
         $this->display();
     }
 
@@ -61,9 +64,10 @@ class upgrade extends control
      * @access public
      * @return void
      */
-    public function execute()
+    public function execute($fromVersion = '')
     {
-        $this->upgrade->execute($this->post->fromVersion);
+        $fromVersion = isset($_POST['fromVersion']) ? $this->post->fromVersion : $fromVersion;
+        $this->upgrade->execute($fromVersion);
 
         $this->view->title      = $this->lang->upgrade->result;
         $this->view->position[] = $this->lang->upgrade->common;