diff --git a/VERSION b/VERSION
index 44931da266..d6b7c4d542 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-9.1.1
+9.1.2
diff --git a/config/config.php b/config/config.php
index 7d41a8bb41..6e4d98c051 100644
--- a/config/config.php
+++ b/config/config.php
@@ -17,7 +17,7 @@ if(!function_exists('getWebRoot')){function getWebRoot(){}}
 
 /* Basic settings. */
 $config = new config();
-$config->version      = '9.1.1';        // The version of zentaopms. Don't change it.
+$config->version      = '9.1.2';        // The version of zentaopms. Don't change it.
 $config->charset      = 'UTF-8';           // The charset of zentaopms.
 $config->cookieLife   = time() + 2592000;  // The cookie life time.
 $config->timezone     = 'Asia/Shanghai';   // The time zone setting, for more see http://www.php.net/manual/en/timezones.php
diff --git a/db/zentao.sql b/db/zentao.sql
index 694905ce68..abb5459b90 100644
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -25,6 +25,7 @@ CREATE TABLE IF NOT EXISTS `zt_block` (
   `params` text NOT NULL,
   `order` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `grid` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `height` smallint(5) unsigned NOT NULL DEFAULT '0',
   `hidden` tinyint(1) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`id`),
   UNIQUE KEY `accountModuleOrder` (`account`,`module`,`order`),
diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php
index f9eee910be..4ca6384505 100644
--- a/module/bug/lang/zh-tw.php
+++ b/module/bug/lang/zh-tw.php
@@ -134,6 +134,7 @@ $lang->bug->legendSteps                 = '重現步驟';
 $lang->bug->legendComment               = '備註';
 $lang->bug->legendLife                  = 'BUG的一生';
 $lang->bug->legendMisc                  = '其他相關';
+$lang->bug->legendRelated               = '其他信息';
 
 /* 功能按鈕。*/
 $lang->bug->buttonConfirm        = '確認';
diff --git a/module/dev/lang/zh-tw.php b/module/dev/lang/zh-tw.php
index cc6337571d..5fd23d1596 100644
--- a/module/dev/lang/zh-tw.php
+++ b/module/dev/lang/zh-tw.php
@@ -52,7 +52,7 @@ $lang->dev->tableList['taskestimate']   = '任務預計';
 $lang->dev->tableList['team']           = '團隊';
 $lang->dev->tableList['testresult']     = '測試結果';
 $lang->dev->tableList['testrun']        = '測試執行';
-$lang->dev->tableList['testtask']       = '測試任務';
+$lang->dev->tableList['testtask']       = '測試版本';
 $lang->dev->tableList['todo']           = '待辦';
 $lang->dev->tableList['user']           = '用戶';
 $lang->dev->tableList['usercontact']    = '用戶聯繫人';
@@ -77,6 +77,8 @@ $lang->dev->tableList['search']         = '搜索';
 $lang->dev->tableList['sso']            = '單點登錄';
 $lang->dev->tableList['svn']            = 'SVN';
 $lang->dev->tableList['testcase']       = '測試用例';
+$lang->dev->tableList['testreport']     = '測試報告';
+$lang->dev->tableList['testsuite']      = '測試套件';
 $lang->dev->tableList['tree']           = '模組關係';
 $lang->dev->tableList['upgrade']        = '更新';
 $lang->dev->tableList['cron']           = '定時任務';
diff --git a/module/testtask/lang/zh-tw.php b/module/testtask/lang/zh-tw.php
index 575037ac40..48a694a2f9 100644
--- a/module/testtask/lang/zh-tw.php
+++ b/module/testtask/lang/zh-tw.php
@@ -42,7 +42,7 @@ $lang->testtask->totalStatus      = "全部";
 $lang->testtask->all              = "全部產品";
 
 $lang->testtask->id             = '編號';
-$lang->testtask->common         = '測試視圖版本';
+$lang->testtask->common         = '測試版本';
 $lang->testtask->product        = '所屬' . $lang->productCommon;
 $lang->testtask->project        = '所屬' . $lang->projectCommon;
 $lang->testtask->build          = '版本';
diff --git a/module/upgrade/lang/en.php b/module/upgrade/lang/en.php
index 48b5499d8e..dff3e0f0cc 100644
--- a/module/upgrade/lang/en.php
+++ b/module/upgrade/lang/en.php
@@ -118,3 +118,4 @@ $lang->upgrade->fromVersions['9_0_beta']  = '9.0.beta';
 $lang->upgrade->fromVersions['9_0']       = '9.0';
 $lang->upgrade->fromVersions['9_0_1']     = '9.0.1';
 $lang->upgrade->fromVersions['9_1']       = '9.1';
+$lang->upgrade->fromVersions['9_1_1']     = '9.1.1';
diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php
index 550c8c425f..f9303dccdc 100644
--- a/module/upgrade/lang/zh-cn.php
+++ b/module/upgrade/lang/zh-cn.php
@@ -118,3 +118,4 @@ $lang->upgrade->fromVersions['9_0_beta']  = '9.0.beta';
 $lang->upgrade->fromVersions['9_0']       = '9.0';
 $lang->upgrade->fromVersions['9_0_1']     = '9.0.1';
 $lang->upgrade->fromVersions['9_1']       = '9.1';
+$lang->upgrade->fromVersions['9_1_1']     = '9.1.1';
diff --git a/module/upgrade/lang/zh-tw.php b/module/upgrade/lang/zh-tw.php
index 6203992b08..8728dc2868 100644
--- a/module/upgrade/lang/zh-tw.php
+++ b/module/upgrade/lang/zh-tw.php
@@ -118,3 +118,4 @@ $lang->upgrade->fromVersions['9_0_beta']  = '9.0.beta';
 $lang->upgrade->fromVersions['9_0']       = '9.0';
 $lang->upgrade->fromVersions['9_0_1']     = '9.0.1';
 $lang->upgrade->fromVersions['9_1']       = '9.1';
+$lang->upgrade->fromVersions['9_1_1']     = '9.1.1';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index aa7aaf9e51..2420f89182 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -172,6 +172,8 @@ class upgradeModel extends model
                 $this->adjustPriv9_0_1();
             case '9_1':
                 $this->execSQL($this->getUpgradeFile('9.1'));
+            case '9_1_1':
+                $this->execSQL($this->getUpgradeFile('9.1.1'));
         }
 
         $this->deletePatch();
@@ -262,6 +264,7 @@ class upgradeModel extends model
         case '9_0':
         case '9_0_1':     $confirmContent .= file_get_contents($this->getUpgradeFile('9.0.1'));
         case '9_1':       $confirmContent .= file_get_contents($this->getUpgradeFile('9.1'));
+        case '9_1_1':     $confirmContent .= file_get_contents($this->getUpgradeFile('9.1.1'));
         }
         return str_replace('zt_', $this->config->db->prefix, $confirmContent);
     }
diff --git a/www/checktable.php b/www/checktable.php
index 62f607d9ca..aac73ddd58 100644
--- a/www/checktable.php
+++ b/www/checktable.php
@@ -1,5 +1,5 @@
 <?php
-error_reporting(E_ALL);
+error_reporting(0);
 
 include '../framework/helper.class.php';
 include '../config/config.php';
@@ -69,7 +69,14 @@ else
 <div class='container mw-700px'>
 <?php if($status == 'createFile'):?>
   <div class='panel-body'>
-    <?php printf($lang->user->noticeResetFile, $_SESSION['checkFileName']);?>
+    <?php
+    $checkFileName = $_SESSION['checkFileName'];
+    if(!($_SERVER['SERVER_ADDR'] == '127.0.0.1' or filter_var($_SERVER['SERVER_ADDR'], FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE) === false))
+    {
+        $checkFileName = str_replace(dirname(dirname(__FILE__)) . DS, '', $checkFileName);
+    }
+    printf($lang->user->noticeResetFile, $checkFileName);
+    ?>
   </div>
   <p><a href='<?php echo $config->webRoot . 'checktable.php';?>' class='btn'><i class='icon-refresh'></i></a></p>
 <?php elseif($status == 'check'):?>