diff --git a/module/mr/ui/actions.html.php b/module/mr/ui/actions.html.php index ca56e7147d..b893835ff1 100644 --- a/module/mr/ui/actions.html.php +++ b/module/mr/ui/actions.html.php @@ -20,7 +20,7 @@ foreach($config->mr->view->operateList as $operate) { if(!common::hasPriv('mr', $operate == 'reject' ? 'approval' : $operate)) continue; if($operate == 'reopen' && (!$MR->synced || $rawMR->state != 'closed')) continue; - if($rawMR->state == 'closed' && $operate == 'accept') continue; + if(in_array($rawMR->state, array('closed', 'merged')) && $operate == 'accept') continue; $action = $config->mr->actionList[$operate]; if($operate === 'edit' || $operate === 'delete')