From 50ed449e6f9dfc9cd4f8c3e092f4acf4896be0c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=B7=E7=9B=9BDiscuz!?= Date: Mon, 23 Jan 2017 20:06:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=9B=9E=E6=BA=AF?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=9A=84=E5=BF=AB=E9=80=9F=E5=8F=91=E5=B8=96?= =?UTF-8?q?=E5=BC=80=E5=85=B3=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=8C=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E5=90=8E=E5=8F=B0=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- upload/source/language/lang_admincp.php | 6 +++--- upload/source/module/forum/forum_viewthread.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/upload/source/language/lang_admincp.php b/upload/source/language/lang_admincp.php index 165ad81..0a718af 100644 --- a/upload/source/language/lang_admincp.php +++ b/upload/source/language/lang_admincp.php @@ -1011,8 +1011,8 @@ $lang = array 'setting_styles_forumdisplay_stick_comment' => '以英文状态下的逗号分割，只有三项有效，级别依次为从高至低', 'setting_styles_forumdisplay_visitedforums' => '显示最近访问版块数量', 'setting_styles_forumdisplay_visitedforums_comment' => '设置在版块列表和帖子浏览中显示最近访问过的版块数量，建议设置为 10 以内，0 为关闭此功能', - 'setting_styles_forumdisplay_fastpost' => '快速发帖', - 'setting_styles_forumdisplay_fastpost_comment' => '底部显示快速发帖表单', + 'setting_styles_forumdisplay_fastpost' => '快速发帖/回帖', + 'setting_styles_forumdisplay_fastpost_comment' => '在主题列表页底部显示快速发帖，在帖子内容页底部显示快速回帖', 'setting_styles_forumdisplay_fastsmilies' => '显示推荐表情', 'setting_styles_forumdisplay_fastsmilies_comment' => '在快速发帖右侧显示推荐表情。推荐的表情需要到“表情管理”中设置', 'setting_styles_forumdisplay_forumpicstyle_thumbwidth' => '主题封面宽度', @@ -1103,7 +1103,7 @@ $lang = array 'setting_styles_viewthread_usernamepos' => '作者用户名显示位置', 'setting_styles_viewthread_imgcontent' => '主题内容生成图片宽度', 'setting_styles_viewthread_imgcontent_comment' => '本功能需要PHP支持GD库，内容里有中文需要将中文 TTF 字体文件放到 static/image/seccode/font/ch/ 目录下。默认100个汉字，字体不同宽度略有差别，请跟据实际效果调整。', - 'setting_styles_viewthread_fast_reply' => '开启帖子快速回复', + 'setting_styles_viewthread_fast_reply' => '开启主题帖快速回复', 'setting_styles_viewthread_fast_reply_comment' => '开启后将在主题帖下方展示快速回复框', 'setting_styles_viewthread_allow_replybg' => '开启帖子快速回复框背景', 'setting_styles_viewthread_allow_replybg_comment' => '开启后允许给帖子快速回复框添加背景图片', diff --git a/upload/source/module/forum/forum_viewthread.php b/upload/source/module/forum/forum_viewthread.php index f5f1bd5..350ecdd 100644 --- a/upload/source/module/forum/forum_viewthread.php +++ b/upload/source/module/forum/forum_viewthread.php @@ -315,8 +315,8 @@ $_G['forum']['allowreply'] = isset($_G['forum']['allowreply']) ? $_G['forum']['a $_G['forum']['allowpost'] = isset($_G['forum']['allowpost']) ? $_G['forum']['allowpost'] : ''; $allowpostreply = ($_G['forum']['allowreply'] != -1) && (($_G['forum_thread']['isgroup'] || (!$_G['forum_thread']['closed'] && !checkautoclose($_G['forum_thread']))) || $_G['forum']['ismoderator']) && ((!$_G['forum']['replyperm'] && $_G['group']['allowreply']) || ($_G['forum']['replyperm'] && forumperm($_G['forum']['replyperm'])) || $_G['forum']['allowreply']); -$fastpost = $_G['setting']['allowfastreply'] && !$_G['forum_thread']['archiveid'] && ($_G['forum']['status'] != 3 || $_G['isgroupuser']); -$allowfastpost = $_G['setting']['allowfastreply'] && $allowpostreply; +$fastpost = $_G['setting']['fastpost'] && !$_G['forum_thread']['archiveid'] && ($_G['forum']['status'] != 3 || $_G['isgroupuser']); +$allowfastpost = $_G['setting']['fastpost'] && $allowpostreply; if(!$_G['uid'] && ($_G['setting']['need_avatar'] || $_G['setting']['need_email'] || $_G['setting']['need_friendnum']) || !$_G['adminid'] && (!cknewuser(1) || $_G['setting']['newbiespan'] && (!getuserprofile('lastpost') || TIMESTAMP - getuserprofile('lastpost') < $_G['setting']['newbiespan'] * 60) && TIMESTAMP - $_G['member']['regdate'] < $_G['setting']['newbiespan'] * 60)) { $allowfastpost = false; }