From 9f6226486e611135bd67b3374322ba04eb18d9da Mon Sep 17 00:00:00 2001 From: Antipkin-A Date: Wed, 4 May 2022 18:34:41 +0300 Subject: fixed check lock (nc24) --- controller/editorapicontroller.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/controller/editorapicontroller.php b/controller/editorapicontroller.php index 7ed5323..1703e03 100644 --- a/controller/editorapicontroller.php +++ b/controller/editorapicontroller.php @@ -310,7 +310,15 @@ class EditorApiController extends OCSController { try { $lockService = \OC::$server->get(LockService::class); $lock = $lockService->getLockFromFileId($file->getId()); - $lockOwner = $lock->getUserId(); + + $lockOwner = null; + if (method_exists($lock, "getUserId")) { + $lockOwner = $lock->getUserId(); + } + else if(method_exists($lock, "getOwner")) { + $lockOwner = $lock->getOwner(); + } + if ($userId !== $lockOwner) { $isTempLock = true; $this->logger->debug("File" . $file->getId() . "is locked by $lockOwner", ["app" => $this->appName]); -- cgit v1.2.3