From c449b53e4be97d76ff983bc79845f078ef6e6ab9 Mon Sep 17 00:00:00 2001 From: zhouxudong Date: Mon, 18 Apr 2022 13:59:09 +0800 Subject: [PATCH] * Fix bug #20178. --- module/action/model.php | 1 + module/mr/model.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/module/action/model.php b/module/action/model.php index c134d317e9..899f4f580b 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -739,6 +739,7 @@ class actionModel extends model elseif($action->action == 'createmr' and strpos($action->extra, '::') !== false) { list($mrCreatedDate, $mrActor, $mrLink) = explode('::', $action->extra); + if(isonlybody()) $mrLink .= '?onlybody=yes'; $this->app->loadLang('mr'); $desc = sprintf($this->lang->mr->createAction, $mrCreatedDate, $mrActor, $mrLink); } diff --git a/module/mr/model.php b/module/mr/model.php index a160889091..07d84f3532 100644 --- a/module/mr/model.php +++ b/module/mr/model.php @@ -1415,7 +1415,7 @@ class mrModel extends model /* Get link action text. */ $MR = $this->getByID($MRID); $users = $this->loadModel('user')->getPairs('noletter'); - $MRCreateAction = $MR->createdDate . '::' . zget($users, $MR->createdBy) . '::' . helper::createLink('mr', 'view', "mr={$MR->id}", '', true); + $MRCreateAction = $MR->createdDate . '::' . zget($users, $MR->createdBy) . '::' . helper::createLink('mr', 'view', "mr={$MR->id}"); foreach($links as $linkID) {