diff --git a/config/config.php b/config/config.php
index 7fa1384841..47b84d3189 100644
--- a/config/config.php
+++ b/config/config.php
@@ -22,11 +22,11 @@
  * @link        http://www.zentaoms.com
  */
 /* 基本参数设定。*/
-$config->version     = '1.0.stable';                    // 版本号，切勿修改。
-$config->encoding    = 'UTF-8';                         // 网站的编码。
-$config->cookiePath  = '/';                             // cookie的有效路径。
-$config->cookieLife  = time() + 2592000;                // cookie的生命周期。
-$config->timezone    = 'Asia/Shanghai';                 //时区设置，详细的列表，请访问 http://www.php.net/manual/en/timezones.php
+$config->version     = '1.0';             // 版本号，切勿修改。
+$config->encoding    = 'UTF-8';           // 网站的编码。
+$config->cookiePath  = '/';               // cookie的有效路径。
+$config->cookieLife  = time() + 2592000;  // cookie的生命周期。
+$config->timezone    = 'Asia/Shanghai';   //时区设置，详细的列表，请访问 http://www.php.net/manual/en/timezones.php
 
 /* 请求方式设置。*/
 $config->requestType = 'PATH_INFO';       // 如何获取当前请求的信息，可选值：PATH_INFO|GET
diff --git a/module/testcase/view/view.html.php b/module/testcase/view/view.html.php
index d11d6c3672..0c3f28470f 100644
--- a/module/testcase/view/view.html.php
+++ b/module/testcase/view/view.html.php
@@ -109,7 +109,7 @@
           <td class='nobr'>
             <?php
             if(isset($case->storyTitle)) echo html::a($this->createLink('story', 'view', "storyID=$case->story"), "#$case->story:$case->storyTitle");
-            if($case->storyStatus == 'active' and $case->latestStoryVersion > $case->storyVersion)
+            if($case->story and $case->storyStatus == 'active' and $case->latestStoryVersion > $case->storyVersion)
             {
                 echo "(<span class='warning'>{$lang->story->changed}</span> ";
                 echo html::a($this->createLink('testcase', 'confirmStoryChange', "caseID=$case->id"), $lang->confirm, 'hiddenwin');
diff --git a/module/upgrade/lang/zh-cn.php b/module/upgrade/lang/zh-cn.php
index e56c0189a3..09e08a6c24 100644
--- a/module/upgrade/lang/zh-cn.php
+++ b/module/upgrade/lang/zh-cn.php
@@ -49,3 +49,4 @@ $lang->upgrade->fromVersions['0_5beta'] = '0.5 BETA';
 $lang->upgrade->fromVersions['0_6beta'] = '0.6 BETA';
 $lang->upgrade->fromVersions['1_0beta'] = '1.0 BETA';
 $lang->upgrade->fromVersions['1_0rc1']  = '1.0 RC1';
+$lang->upgrade->fromVersions['1_0rc2']  = '1.0 RC2';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 62e0faa975..b20fb9642e 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -75,6 +75,10 @@ class upgradeModel extends model
             $this->upgradeFrom1_0rc1To1_0rc2();
             $this->upgradeFrom1_0rc2To1_0stable();
         }
+        elseif($fromVersion == '1_0rc2')
+        {
+            $this->upgradeFrom1_0rc2To1_0stable();
+        }
     }
 
     /* 纭銆�*/
@@ -169,9 +173,9 @@ class upgradeModel extends model
     }
 
     /* 浠�1.0rc2鐗堟湰鍗囩骇鍒�1.0stable鐗堟湰銆�*/
-    private function upgradeFrom1_0rc1To1_0rc2()
+    private function upgradeFrom1_0rc2To1_0stable()
     {
-        $this->updateVersion('1.0rc2');
+        $this->updateVersion('1.0');
     }
 
     /* 鏇存柊姣忎釜琛ㄧ殑company瀛楁銆�*/