Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Reformat code for accept MR.

Browse Source
This commit is contained in:
dingguodong
2021-09-03 13:39:54 +08:00
parent 13506c3cbd
commit c80ce42a12
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/mr/control.php
+2 -1
View File
@@ -187,9 +187,10 @@ class mr extends control
{
return $this->send(array('result' => 'success', 'message' => $this->lang->mr->mergeSuccess, 'locate' => helper::createLink('mr', 'browse')));
}
/* The type of variable `$rawMR->message` is string. This is different with apiCreateMR. */
/* The type of variable `$rawMR->message` is string. This is different with apiCreateMR. */
if(isset($rawMR->message)) return $this->send(array('result' => 'fail', 'message' => sprintf($this->lang->mr->apiError->sudo, $rawMR->message), 'locate' => helper::createLink('mr', 'view', "mr={$MRID}")));
return $this->send(array('result' => 'fail', 'message' => $this->lang->mr->mergeFailed, 'locate' => helper::createLink('mr', 'view', "mr={$MRID}")));
}