diff --git a/module/common/lang/menuOrder.php b/module/common/lang/menuOrder.php
index 8f1038cdb3..1340e89c6a 100644
--- a/module/common/lang/menuOrder.php
+++ b/module/common/lang/menuOrder.php
@@ -124,6 +124,7 @@ $lang->admin->subMenuOrder->dev[20]     = 'entry';
 $lang->admin->subMenuOrder->data[5]     = 'backup';
 $lang->admin->subMenuOrder->data[10]    = 'trash';
 $lang->admin->subMenuOrder->system[5]   = 'cron';
+$lang->admin->subMenuOrder->system[10]  = 'timezone';
 
 $lang->convert->menuOrder   = $lang->admin->menuOrder;
 $lang->upgrade->menuOrder   = $lang->admin->menuOrder;
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 46606369c2..9356bc5b79 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -400,7 +400,8 @@ $lang->admin->subMenu->data->backup = array('link' => '备份|backup|index', 'su
 $lang->admin->subMenu->data->trash  = '回收站|action|trash';
 
 $lang->admin->subMenu->system = new stdclass();
-$lang->admin->subMenu->system->cron = array('link' => '定时|cron|index', 'subModule' => 'cron');
+$lang->admin->subMenu->system->cron     = array('link' => '定时|cron|index', 'subModule' => 'cron');
+$lang->admin->subMenu->system->timezone = array('link' => '时区|custom|timezone', 'subModule' => 'custom');
 
 $lang->convert   = new stdclass();
 $lang->upgrade   = new stdclass();
diff --git a/module/custom/control.php b/module/custom/control.php
index 5440ea9797..87c4c623b8 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -337,6 +337,10 @@ class custom extends control
             $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'reload'));
         }
 
+        unset($this->lang->admin->menu->custom['subModule']);
+        $this->lang->admin->menu->system['subModule'] = 'custom';
+        $this->lang->custom->menu = $this->lang->admin->menu;
+
         $this->view->title = $this->lang->custom->timezone;
         $this->view->position[] = $this->lang->custom->timezone;
         $this->display();
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index cdafde4fe0..868406e8d2 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -92,6 +92,7 @@ $lang->custom->notice->forceNotReview              = "指定人提交的%s不需
 $lang->custom->notice->longlife                    = 'Bug列表页面的久未处理标签中，列出设置天数之前未处理的Bug。';
 $lang->custom->notice->invalidNumberKey            = '键值应为不大于255的数字';
 $lang->custom->notice->invalidStringKey            = '键值应当为小写英文字母、数字或下划线的组合';
+$lang->custom->notice->cannotSetTimezone           = 'date_default_timezone_set方法不存在或禁用，不能设置时区。';
 
 $lang->custom->notice->indexPage['product']        = "从8.2版本起增加了产品主页视图，是否默认进入产品主页？";
 $lang->custom->notice->indexPage['project']        = "从8.2版本起增加了项目主页视图，是否默认进入项目主页？";
diff --git a/module/custom/view/header.html.php b/module/custom/view/header.html.php
index 67316c32a4..25442e6a55 100644
--- a/module/custom/view/header.html.php
+++ b/module/custom/view/header.html.php
@@ -6,7 +6,6 @@
   {
       common::printLink('custom', 'set', "module=$object", "<span class='text'>{$name}</span>", '', "class='btn btn-link' id='{$object}Tab'"); 
   }
-  common::printLink('custom', 'timezone', "", "<span class='text'>{$lang->custom->timezone}</span>", '', "class='btn btn-link' id='timezoneTab'"); 
   common::printLink('custom', 'flow', "", "<span class='text'>{$lang->custom->flow}</span>", '', "class='btn btn-link' id='flowTab'"); 
   common::printLink('custom', 'working', '', "<span class='text'>{$lang->custom->working}</span>", '', "class='btn btn-link' id='workingTab'"); 
   common::printLink('custom', 'required', '', "<span class='text'>{$lang->custom->required}</span>", '', "class='btn btn-link' id='requiredTab'");
diff --git a/module/custom/view/timezone.html.php b/module/custom/view/timezone.html.php
index 703981133c..020622f070 100644
--- a/module/custom/view/timezone.html.php
+++ b/module/custom/view/timezone.html.php
@@ -10,32 +10,29 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php include 'header.html.php';?>
-<?php include $this->app->getConfigRoot() . 'timezones.php';?>
+<?php include '../../common/view/header.html.php';?>
+<div id='mainMenu' class='clearfix'>
+  <div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('system');?></div>
+</div>
 <div id='mainContent' class='main-content'>
-  <form class="load-indicator main-form form-ajax" method='post'>
-    <div class='main-header'>
-      <div class='heading'>
-        <strong><?php echo $lang->custom->timezone?></strong>
-      </div>
-    </div>
-    <table class='table table-form'>
-      <tr>
-        <th class='w-200px'><?php echo $lang->custom->timezone;?></th>
-        <td><?php echo html::select('timezone', $timezoneList, $config->timezone, "class='form-control chosen'");?></td>
-      </tr>
-      <tr>
-        <th></th>
-        <td class='form-actions'><?php echo html::submitButton();?></td>
-      </tr>
-    </table>
-  </form>
+  <div class='center-block mw-500px'>
+    <?php if(!function_exists('date_default_timezone_set')):?>
+    <div class='alert alert-warning'><?php echo $lang->custom->notice->cannotSetTimezone;?></div>
+    <?php else:?>
+    <?php include $this->app->getConfigRoot() . 'timezones.php';?>
+    <form class="load-indicator main-form form-ajax" method='post'>
+      <table class='table table-form'>
+        <tr>
+          <th class='w-80px'><?php echo $lang->custom->timezone;?></th>
+          <td><?php echo html::select('timezone', $timezoneList, $config->timezone, "class='form-control chosen'");?></td>
+        </tr>
+        <tr>
+          <td colspan='2' class='form-actions text-center'><?php echo html::submitButton();?></td>
+        </tr>
+      </table>
+    </form>
+    <?php endif;?>
+  </div>
 </div>
-<script>
-$(function()
-{
-    $('#mainMenu #timezoneTab').addClass('btn-active-text');
-})
-</script>
 <?php include '../../common/view/footer.html.php';?>
 
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index 6933449638..aee319e855 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -160,20 +160,6 @@ $lang->doc->noEditedDoc        = 'You have not edited any document.';
 $lang->doc->noOpenedDoc        = 'You have not created any document.';
 $lang->doc->noCollectedDoc     = 'You have not collected any document.';
 
-$lang->doc->noticeAcl['lib']['product']['open']    = 'Everyone can access it unless the user has no access to the associated product.';
-$lang->doc->noticeAcl['lib']['product']['custom']  = 'Users of whitelists and associated product with access rights can access them.';
-$lang->doc->noticeAcl['lib']['product']['private'] = 'Creators and users of associated product with access rights can access them.';
-$lang->doc->noticeAcl['lib']['project']['open']    = 'Everyone can access it unless the user has no access to the associated project.';
-$lang->doc->noticeAcl['lib']['project']['custom']  = 'Users of whitelists and associated project with access rights can access them.';
-$lang->doc->noticeAcl['lib']['project']['private'] = 'Creators and users of associated project with access rights can access them.';
-$lang->doc->noticeAcl['lib']['custom']['open']     = 'Everyone can visit it.';
-$lang->doc->noticeAcl['lib']['custom']['custom']   = 'Whitelist users are accessible.';
-$lang->doc->noticeAcl['lib']['custom']['private']  = 'Only the creator can access it.';
-
-$lang->doc->noticeAcl['doc']['open']    = 'Everyone can access it unless the user does not have permission to belong to the document library.';
-$lang->doc->noticeAcl['doc']['custom']  = 'Whitelist users are accessible.';
-$lang->doc->noticeAcl['doc']['private'] = 'Only the creator can access it.';
-
 $lang->doc->placeholder = new stdclass();
 $lang->doc->placeholder->url = 'Url';
 
diff --git a/module/report/model.php b/module/report/model.php
index 0e249dd78d..d6750e1fb1 100644
--- a/module/report/model.php
+++ b/module/report/model.php
@@ -432,7 +432,7 @@ class reportModel extends model
             ->where('t1.assignedTo')->ne('')
             ->andWhere('t1.deleted')->eq(0)
             ->andWhere('t2.deleted')->eq(0)
-            ->andWhere('t1.status')->in('wait, doing')
+            ->andWhere('t1.status')->in('wait,doing')
             ->andWhere('t3.status')->ne('suspended')
             ->andWhere('t1.deadline', true)->eq('0000-00-00')
             ->orWhere('t1.deadline')->lt(date(DT_DATE1, strtotime('+4 day')))