diff --git a/upload/source/admincp/admincp_forums.php b/upload/source/admincp/admincp_forums.php
index 7fa6fb5..deb30b6 100644
--- a/upload/source/admincp/admincp_forums.php
+++ b/upload/source/admincp/admincp_forums.php
@@ -4,7 +4,7 @@
  *      [Discuz!] (C)2001-2099 Comsenz Inc.
  *      This is NOT a freeware, use is subject to license terms
  *
- *      $Id: admincp_forums.php 36284 2016-12-12 00:47:50Z nemohou $
+ *      $Id: admincp_forums.php 36345 2017-01-12 01:55:04Z nemohou $
  */
 
 if(!defined('IN_DISCUZ') || !defined('IN_ADMINCP')) {
@@ -1067,7 +1067,7 @@ EOT;
 
 					showtagheader('div', 'threadtypes_manage', $forum['threadtypes']['status']);
 					showtableheader('forums_edit_threadtypes', 'noborder fixpadding');
-					showsubtitle(array('delete', 'display_order', 'forums_edit_threadtypes_name', 'forums_edit_threadtypes_icon', 'enable', 'forums_edit_threadtypes_moderators'));
+					showsubtitle(array('delete', 'display_order', cplang('forums_edit_threadtypes_name').' '.cplang('tiny_bbcode_support'), 'forums_edit_threadtypes_icon', 'enable', 'forums_edit_threadtypes_moderators'));
 					echo $typeselect;
 					echo '<tr><td colspan="7"><div><a href="###" onclick="addrow(this, 0)" class="addtr">'.cplang('threadtype_infotypes_add').'</a></div></td></tr>';
 					showtablefooter();
diff --git a/upload/source/admincp/admincp_threadtypes.php b/upload/source/admincp/admincp_threadtypes.php
index 6dc1a66..c6f9fb1 100644
--- a/upload/source/admincp/admincp_threadtypes.php
+++ b/upload/source/admincp/admincp_threadtypes.php
@@ -4,7 +4,7 @@
  *      [Discuz!] (C)2001-2099 Comsenz Inc.
  *      This is NOT a freeware, use is subject to license terms
  *
- *      $Id: admincp_threadtypes.php 32161 2012-11-20 02:37:41Z zhangjie $
+ *      $Id: admincp_threadtypes.php 36345 2017-01-12 01:55:04Z nemohou $
  */
 
 if(!defined('IN_DISCUZ') || !defined('IN_ADMINCP')) {
@@ -47,7 +47,7 @@ if(!$operation) {
 		$query = C::t('forum_threadtype')->fetch_all_for_order();
 		foreach($query as $type) {
 			$tmpstr = "<a href=\"".ADMINSCRIPT."?action=threadtypes&operation=export&sortid=$type[typeid]\" class=\"act nowrap\">$lang[export]</a>";
-			$threadtypes .= showtablerow('', array('class="td25"', 'class="td28"', '', 'class="td29"', 'title="'.cplang('forums_threadtypes_forums_comment').'"'), array(
+			$threadtypes .= showtablerow('', array('class="td25"', 'class="td28"', 'class="td29"', 'class="td29"', 'title="'.cplang('forums_threadtypes_forums_comment').'"'), array(
 				"<input class=\"checkbox\" type=\"checkbox\" name=\"delete[]\" value=\"$type[typeid]\">",
 				"<input type=\"text\" class=\"txt\" size=\"2\" name=\"displayordernew[$type[typeid]]\" value=\"$type[displayorder]\">",
 				"<input type=\"text\" class=\"txt\" size=\"15\" name=\"namenew[$type[typeid]]\" value=\"".dhtmlspecialchars($type['name'])."\">",
@@ -65,7 +65,7 @@ var rowtypedata = [
 	[
 		[1, '', 'td25'],
 		[1, '<input type="text" class="txt" name="newdisplayorder[]" size="2" value="">', 'td28'],
-		[1, '<input type="text" class="txt" name="newname[]" size="15">'],
+		[1, '<input type="text" class="txt" name="newname[]" size="15">', 'td29'],
 		[1, '<input type="text" class="txt" name="newdescription[]" size="30" value="">', 'td29'],
 		[2, '']
 	],
@@ -81,7 +81,7 @@ var rowtypedata = [
 
 		showformheader("threadtypes&", 'enctype', 'threadtypeform');
 		showtableheader('');
-		showsubtitle(array('', 'display_order', 'name', 'description', 'forums_relation', '', ''), 'header', array('', 'width="60"', 'width="110"', 'width="210"', '', 'width="90"', 'width="60"'));
+		showsubtitle(array('', 'display_order', cplang('name').' '.cplang('tiny_bbcode_support'), 'description', 'forums_relation', '', ''), 'header', array('', 'width="60"', 'width="110"', 'width="210"', '', 'width="90"', 'width="60"'));
 		echo $threadtypes;
 		echo '<tr><td class="td25"></td><td colspan="5"><div>'.'<span class="filebtn"><input type="hidden" name="importtype" value="file" /><input type="file" name="importfile" class="pf" size="1" onchange="uploadthreadtypexml($(\'threadtypeform\'), \''.ADMINSCRIPT.'?action=threadtypes&operation=import\');" /><a class="addtr" href="JavaScript:;">'.$lang['import'].'</a></span>'.'<a href="###" onclick="addrow(this, 0)" class="addtr">'.$lang['threadtype_infotypes_add'].'</a></div></td>';
 
diff --git a/upload/source/function/function_forum.php b/upload/source/function/function_forum.php
index 0f5e948..126edc1 100644
--- a/upload/source/function/function_forum.php
+++ b/upload/source/function/function_forum.php
@@ -4,7 +4,7 @@
  *      [Discuz!] (C)2001-2099 Comsenz Inc.
  *      This is NOT a freeware, use is subject to license terms
  *
- *      $Id: function_forum.php 36278 2016-12-09 07:52:35Z nemohou $
+ *      $Id: function_forum.php 36345 2017-01-12 01:55:04Z nemohou $
  */
 
 if(!defined('IN_DISCUZ')) {
@@ -1148,7 +1148,17 @@ function safefilter(&$data) {
 			safefilter($data[$k]);
 		}
 	} else {
-		$data = strip_tags($data);
+		$data = str_replace(array(
+			'[/color]', '[b]', '[/b]', '[s]', '[/s]', '[i]', '[/i]', '[u]', '[/u]',
+			), array(
+			'</font>', '<b>', '</b>', '<strike>', '</strike>', '<i>', '</i>', '<u>', '</u>'
+			), preg_replace(array(
+			"/\[color=([#\w]+?)\]/i",
+			"/\[color=((rgb|rgba)\([\d\s,]+?\))\]/i",
+			), array(
+			"<font color=\"\\1\">",
+			"<font style=\"color:\\1\">",
+			), strip_tags($data)));
 	}
 }
 
diff --git a/upload/source/language/lang_admincp.php b/upload/source/language/lang_admincp.php
index 586678e..165ad81 100644
--- a/upload/source/language/lang_admincp.php
+++ b/upload/source/language/lang_admincp.php
@@ -4,7 +4,7 @@
  *      [Discuz!] (C)2001-2099 Comsenz Inc.
  *      This is NOT a freeware, use is subject to license terms
  *
- *      $Id: lang_admincp.php 36306 2016-12-16 08:12:49Z nemohou $
+ *      $Id: lang_admincp.php 36345 2017-01-12 01:55:04Z nemohou $
  */
 
 if(!defined('IN_DISCUZ')) {
@@ -272,6 +272,8 @@ $lang = array
 	'admincp_maptext' => '管理中心导航(ESC键)',
 	'admincp_maptitle' => '管理中心导航',
 
+	'tiny_bbcode_support' => '<em>(支持[color][b][u][i][s])</em>',
+
 	'nav_newwin' => '新窗口打开',
 	'nav_index' => '首页',
 	'nav_global' => '全局',