diff --git a/db/demo.sql b/db/demo.sql
index 7bcaaa5ac3..5318e9bd66 100644
--- a/db/demo.sql
+++ b/db/demo.sql
@@ -218,13 +218,13 @@ INSERT INTO `zt_module` (`id`, `root`, `name`, `parent`, `path`, `grade`, `order
 INSERT INTO `zt_module` (`id`, `root`, `name`, `parent`, `path`, `grade`, `order`, `type`, `owner`) VALUES(13, 1, '合作洽谈', 0, ',13,', 1, 60, 'bug', '');
 INSERT INTO `zt_module` (`id`, `root`, `name`, `parent`, `path`, `grade`, `order`, `type`, `owner`) VALUES(14, 1, '关于我们', 0, ',14,', 1, 70, 'bug', '');
 
-INSERT INTO `zt_product` (`id`, `name`, `code`, `status`, `desc`, `PO`, `QD`, `RD`, `acl`, `whitelist`, `createdBy`, `createdDate`, `order`, `deleted`) VALUES(1, '公司企业网站建设', 'companyWebsite', 'normal', '建立公司企业网站，可以更好对外展示。<br />', 'productManager', 'testManager', 'productManager', 'open', '', 'productManager', '2012-06-05 09:57:07', '1', '0');
-INSERT INTO `zt_product` (`id`, `name`, `code`, `status`, `desc`, `PO`, `QD`, `RD`, `acl`, `whitelist`, `createdBy`, `createdDate`, `order`, `createdVersion`, `deleted`) VALUES(2, '企业内部工时管理系统', 'workhourManage', 'normal', '', 'productManager', 'testManager', 'productManager', 'open', '', 'productManager', '2012-06-05 11:15:20', '2', '5.2.1', '0');
+INSERT INTO `zt_product` (`id`, `name`, `code`, `status`, `desc`, `PO`, `QD`, `RD`, `acl`, `whitelist`, `createdBy`, `createdDate`, `order`, `deleted`) VALUES(1, '公司企业网站建设', 'companyWebsite', 'normal', '建立公司企业网站，可以更好对外展示。<br />', 'productManager', 'testManager', 'productManager', 'open', '', 'productManager', '2012-06-05 09:57:07', '5', '0');
+INSERT INTO `zt_product` (`id`, `name`, `code`, `status`, `desc`, `PO`, `QD`, `RD`, `acl`, `whitelist`, `createdBy`, `createdDate`, `order`, `createdVersion`, `deleted`) VALUES(2, '企业内部工时管理系统', 'workhourManage', 'normal', '', 'productManager', 'testManager', 'productManager', 'open', '', 'productManager', '2012-06-05 11:15:20', '10', '5.2.1', '0');
 
 INSERT INTO `zt_productplan` (`id`, `product`, `title`, `desc`, `begin`, `end`, `deleted`) VALUES(1, 1, '1.0版本', '开发出企业网站1.0版本。<br />', '2000-01-01', '2015-01-01', '0');
 
-INSERT INTO `zt_project` (`id`, `isCat`, `catID`, `type`, `parent`, `name`, `code`, `begin`, `end`, `days`, `status`, `statge`, `pri`, `desc`, `openedBy`, `openedDate`, `closedBy`, `closedDate`, `canceledBy`, `canceledDate`, `PO`, `PM`, `QD`, `RD`, `team`, `acl`, `whitelist`, `order`, `deleted`) VALUES(1, '0', 0, 'sprint', 0, '企业网站第一期', 'coWeb1', '2012-06-05', '2012-12-04', 184, 'done', '1', '1', '开发企业网站的基本雏形。<br />', '', 0, '', 0, '', 0, 'productManager', 'projectManager', 'testManager', 'productManager', '公司开发团队', 'open', '', '1', '0');
-INSERT INTO `zt_project` (`id`, `isCat`, `catID`, `type`, `parent`, `name`, `code`, `begin`, `end`, `days`, `status`, `statge`, `pri`, `desc`, `openedBy`, `openedDate`, `closedBy`, `closedDate`, `canceledBy`, `canceledDate`, `PO`, `PM`, `QD`, `RD`, `team`, `acl`, `whitelist`, `order`, `deleted`) VALUES(2, '0', 0, 'sprint', 0, '企业网站第二期', 'coWebsite2', '2013-06-05', '2014-06-04', 365, 'wait', '1', '1', '', '', 0, '', 0, '', 0, 'productManager', 'projectManager', 'testManager', 'productManager', '公司开发团队', 'open', '', '2', '0');
+INSERT INTO `zt_project` (`id`, `isCat`, `catID`, `type`, `parent`, `name`, `code`, `begin`, `end`, `days`, `status`, `statge`, `pri`, `desc`, `openedBy`, `openedDate`, `closedBy`, `closedDate`, `canceledBy`, `canceledDate`, `PO`, `PM`, `QD`, `RD`, `team`, `acl`, `whitelist`, `order`, `deleted`) VALUES(1, '0', 0, 'sprint', 0, '企业网站第一期', 'coWeb1', '2012-06-05', '2012-12-04', 184, 'done', '1', '1', '开发企业网站的基本雏形。<br />', '', 0, '', 0, '', 0, 'productManager', 'projectManager', 'testManager', 'productManager', '公司开发团队', 'open', '', '5', '0');
+INSERT INTO `zt_project` (`id`, `isCat`, `catID`, `type`, `parent`, `name`, `code`, `begin`, `end`, `days`, `status`, `statge`, `pri`, `desc`, `openedBy`, `openedDate`, `closedBy`, `closedDate`, `canceledBy`, `canceledDate`, `PO`, `PM`, `QD`, `RD`, `team`, `acl`, `whitelist`, `order`, `deleted`) VALUES(2, '0', 0, 'sprint', 0, '企业网站第二期', 'coWebsite2', '2013-06-05', '2014-06-04', 365, 'wait', '1', '1', '', '', 0, '', 0, '', 0, 'productManager', 'projectManager', 'testManager', 'productManager', '公司开发团队', 'open', '', '10', '0');
 
 INSERT INTO `zt_projectproduct` (`project`, `product`) VALUES(1, 1);
 INSERT INTO `zt_projectproduct` (`project`, `product`) VALUES(2, 1);
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index b0bb7f2144..e4abfb924c 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -106,7 +106,7 @@ $lang->bug->resolvedByMe   = 'MyResolve';
 $lang->bug->closedByMe     = 'MyClose';
 $lang->bug->assignToNull   = 'Unassigned';
 $lang->bug->unResolved     = 'Unresolved';
-$lang->bug->toClosed       = 'Stay close';
+$lang->bug->toClosed       = 'Closing';
 $lang->bug->unclosed       = 'Unclosed';
 $lang->bug->longLifeBugs   = 'Longlife';
 $lang->bug->postponedBugs  = 'Postponed';
diff --git a/module/file/view/export2csv.html.php b/module/file/view/export2csv.html.php
index d3dbd3fa37..0ae5411d2d 100644
--- a/module/file/view/export2csv.html.php
+++ b/module/file/view/export2csv.html.php
@@ -17,7 +17,7 @@ foreach($rows as $row)
     echo '"';
     foreach($fields as $fieldName => $fieldLabel)
     {
-        isset($row->$fieldName) ? print(strip_tags($row->$fieldName)) : print('');
+        isset($row->$fieldName) ? print($row->$fieldName) : print('');
         echo '","';
     }
     echo '"' . "\n";
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index e700e2b11a..fe12104b3b 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -952,11 +952,8 @@ class upgradeModel extends model
      */
     public function adjustOrder7_3()
     {
-        $products = $this->dao->select('`order`')->from(TABLE_PRODUCT)->orderBy('order desc')->limit(2)->fetchAll();
-        if(count($products) == 2 and ($products[0]->order - $products[1]->order) != 5) $this->dao->update(TABLE_PRODUCT)->set('`order`=`order` * 5')->exec();
-
-        $projects = $this->dao->select('`order`')->from(TABLE_PROJECT)->orderBy('order desc')->limit(2)->fetchAll();
-        if(count($projects) == 2 and ($projects[0]->order - $projects[1]->order) != 5) $this->dao->update(TABLE_PROJECT)->set('`order`=`order` * 5')->exec();
+        $this->loadModel('product')->fixOrder();
+        $this->loadModel('project')->fixOrder();
 
         return true;
     }