diff --git a/upload/source/admincp/admincp_setting.php b/upload/source/admincp/admincp_setting.php
index 59a672fa99f63b16df08b2e4edd06f4d9bf3ee96..2addc93df3f779ee2e92f8621eb516ab098421ef 100644
--- a/upload/source/admincp/admincp_setting.php
+++ b/upload/source/admincp/admincp_setting.php
@@ -1205,6 +1205,7 @@ EOF;
 		showsetting('setting_functions_mod_maxmodworksmonths', 'settingnew[maxmodworksmonths]', $setting['maxmodworksmonths'], 'text');
 		showsetting('setting_functions_mod_losslessdel', 'settingnew[losslessdel]', $setting['losslessdel'], 'text');
 		showsetting('setting_functions_mod_reasons', 'settingnew[modreasons]', $setting['modreasons'], 'textarea');
+		showsetting('setting_functions_mod_reasons_public', 'settingnew[modreasons_public]', $setting['modreasons_public'], 'radio');
 		showsetting('setting_functions_user_reasons', 'settingnew[userreasons]', $setting['userreasons'], 'textarea');
 		showsetting('setting_functions_mod_bannedmessages', array('settingnew[bannedmessages]', array(
 			$lang['setting_functions_mod_bannedmessages_thread'],
diff --git a/upload/source/include/topicadmin/topicadmin_moderate.php b/upload/source/include/topicadmin/topicadmin_moderate.php
index 55bc6012b32d9855f71bc8561ff7d2ae52e24b4e..12205b50abf6d46fc64cd6f8ce39f4497dd23c43 100644
--- a/upload/source/include/topicadmin/topicadmin_moderate.php
+++ b/upload/source/include/topicadmin/topicadmin_moderate.php
@@ -678,11 +678,7 @@ if(!submitcheck('modsubmit')) {
 			}
 
 			if($updatemodlog) {
-				if($operation != 'delete') {
-					updatemodlog($moderatetids, $modaction, $expiration);
-				} else {
-					updatemodlog($moderatetids, $modaction, $expiration, 0, $reason);
-				}
+				updatemodlog($moderatetids, $modaction, $expiration, 0, $reason);
 			}
 
 			updatemodworks($modaction, $modpostsnum);
diff --git a/upload/source/language/lang_admincp.php b/upload/source/language/lang_admincp.php
index 483277228ed2926495ac36433a4f3f2926ae04cb..30547871f78ef2c7cfbc2463757c5ddd48b3a716 100644
--- a/upload/source/language/lang_admincp.php
+++ b/upload/source/language/lang_admincp.php
@@ -1691,7 +1691,9 @@ $lang = array
 	'setting_functions_mod_warningexpiration_comment' => '默认为 30 天',
 	'setting_functions_mod_reasons' => '管理操作理由选项',
 	'setting_functions_user_reasons' => '用户评分理由选项',
+	'setting_functions_mod_reasons_public' => '是否公开管理操作理由',
 	'setting_functions_mod_reasons_comment' => '本设定将在用户执行部分管理操作时显示，每个理由一行，如果空行则显示一行分隔符“--------”，用户可选择本设定中预置的理由选项或自行输入',
+	'setting_functions_mod_reasons_public_comment' => '开启后点击主题帖下方主题操作记录将同时显示管理操作理由',
 	'setting_functions_user_reasons_comment' => '本设定将在用户执行评分时显示，每个理由一行，如果空行则显示一行分隔符“--------”，用户可选择本设定中预置的理由选项或自行输入',
 	'setting_functions_mod_bannedmessages' => '隐藏敏感帖子内容',
 	'setting_functions_mod_bannedmessages_comment' => '选择相应项目将隐藏被删除或被禁止的用户的相关资料，在相关资料处显示被屏蔽的字样',
diff --git a/upload/source/module/forum/forum_misc.php b/upload/source/module/forum/forum_misc.php
index bc3f1dc76f2eee1fd683c52b59613fd2081b6e23..f4eb3d06431e64a85abdb17af33cf2fb6f2e8b19 100644
--- a/upload/source/module/forum/forum_misc.php
+++ b/upload/source/module/forum/forum_misc.php
@@ -991,7 +991,7 @@ if($_GET['action'] == 'votepoll' && submitcheck('pollsubmit', 1)) {
 
 	foreach(C::t('forum_threadmod')->fetch_all_by_tid($_G['tid']) as $log) {
 		$log['dateline'] = dgmdate($log['dateline'], 'u');
-		$log['expiration'] = !empty($log['expiration']) ? dgmdate($log['expiration'], 'd') : '';
+		$log['expiration'] = !empty($log['expiration']) ? dgmdate($log['expiration'], 'dt') : '';
 		$log['status'] = empty($log['status']) ? 'style="text-decoration: line-through" disabled' : '';
 		if(!$modactioncode[$log['action']] && preg_match('/S(\d\d)/', $log['action'], $a) || $log['action'] == 'SPA') {
 			loadcache('stamps');
@@ -1017,6 +1017,8 @@ if($_GET['action'] == 'votepoll' && submitcheck('pollsubmit', 1)) {
 		showmessage('threadmod_nonexistence');
 	}
 
+	$reasons_public = $_G['setting']['modreasons_public'];
+
 	include template('forum/viewthread_mod');
 
 } elseif($_GET['action'] == 'bestanswer' && $_G['tid'] && $_GET['pid'] && submitcheck('bestanswersubmit')) {
diff --git a/upload/template/default/forum/viewthread_mod.htm b/upload/template/default/forum/viewthread_mod.htm
index 934289f2595d14c034da5fe61f555c4d5554a5f7..2d452634ac14916a5762dffd207c4e722b5c5215 100644
--- a/upload/template/default/forum/viewthread_mod.htm
+++ b/upload/template/default/forum/viewthread_mod.htm
@@ -18,21 +18,36 @@
 	<div class="c floatwrap">
 		<table class="list" cellspacing="0" cellpadding="0">
 			<thead>
-				<tr>
+				<tr>
+				<!--{if $reasons_public}-->
+					<td>{lang thread_moderations_username}</td>
+					<td>{lang time} / {lang expire}</td>
+					<td>{lang thread_moderations_action}</td>
+					<td>{lang reason}</td>
+				<!--{else}-->
 					<td>{lang thread_moderations_username}</td>
 					<td>{lang time}</td>
 					<td>{lang thread_moderations_action}</td>
-					<td>{lang expire}</td>
+					<td>{lang expire}</td>
+				<!--{/if}-->
 				</tr>
 			</thead>
 			<!--{loop $loglist $log}-->
-				<tr>
+				<tr>
+				<!--{if $reasons_public}-->
+					<td><!--{if $log['uid']}--><a href="home.php?mod=space&uid=$log['uid']" target="_blank">$log[username]</a><!--{else}-->{lang thread_moderations_cron}<!--{/if}--></td>
+					<td>$log[dateline]<br /><span $log[status]><!--{if $log['expiration']}-->$log[expiration]<!--{elseif in_array($log['action'], array('STK', 'HLT', 'DIG', 'CLS', 'OPN'))}-->{lang expiration_unlimit}<!--{/if}--></span></td>
+					<td $log[status]>{$modactioncode[$log['action']]}<!--{if $log['magicid']}-->($log[magicname])<!--{/if}-->
+					</td>
+					<td $log[status]><!--{if $log['action'] == 'REB'}-->{lang to} <!--{/if}-->$log['reason']</td>
+				<!--{else}-->
 					<td><!--{if $log['uid']}--><a href="home.php?mod=space&uid=$log['uid']" target="_blank">$log[username]</a><!--{else}-->{lang thread_moderations_cron}<!--{/if}--></td>
 					<td>$log[dateline]</td>
 					<td $log[status]>{$modactioncode[$log['action']]}<!--{if $log['magicid']}-->($log[magicname])<!--{/if}-->
 						<!--{if $log['action'] == 'REB'}-->{lang to} $log['reason']<!--{/if}-->
 					</td>
-					<td $log[status]><!--{if $log['expiration']}-->$log[expiration]<!--{elseif in_array($log['action'], array('STK', 'HLT', 'DIG', 'CLS', 'OPN'))}-->{lang expiration_unlimit}<!--{/if}--></td>
+					<td $log[status]><!--{if $log['expiration']}-->$log[expiration]<!--{elseif in_array($log['action'], array('STK', 'HLT', 'DIG', 'CLS', 'OPN'))}-->{lang expiration_unlimit}<!--{/if}--></td>
+				<!--{/if}-->
 				</tr>
 			<!--{/loop}-->
 		</table>