fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 03:01:43 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #2145 rename $is_admin to more descriptive variable name in some controller actions

Browse source
This commit is contained in:
Kijin Sung 2023-09-13 11:15:13 +09:00
parent 71e4118bd5
commit 26f923d64b
3 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/document/document.controller.php
View file

@ -1236,12 +1236,12 @@ class DocumentController extends Document
/**
* Deleting Documents
* @param int $document_srl
* @param bool $is_admin
* @param bool $skip_grant_check
* @param bool $isEmptyTrash
* @param documentItem $oDocument
* @return object
*/
function deleteDocument($document_srl, $is_admin = false, $isEmptyTrash = false, $oDocument = null)
function deleteDocument($document_srl, $skip_grant_check = false, $isEmptyTrash = false, $oDocument = null)
{
// Call a trigger (before)
$trigger_obj = new stdClass();
@ -1253,7 +1253,7 @@ class DocumentController extends Document
// Check if the document exists
if(!$isEmptyTrash)
{
$oDocument = DocumentModel::getDocument($document_srl, $is_admin);
$oDocument = DocumentModel::getDocument($document_srl);
}
else if($isEmptyTrash && $oDocument == null)
{
@ -1265,7 +1265,7 @@ class DocumentController extends Document
{
return new BaseObject(-1, 'msg_invalid_document');
}
if(!$oDocument->isGranted())
if(!$skip_grant_check && !$oDocument->isGranted())
{
return new BaseObject(-1, 'msg_not_permitted');
}