diff options
author | Sergey Linnik <sergey.linnik@onlyoffice.com> | 2022-05-05 14:32:18 +0300 |
---|---|---|
committer | Sergey Linnik <sergey.linnik@onlyoffice.com> | 2022-05-05 14:32:18 +0300 |
commit | 40bde6a6922d348df5bd64b43e45ac7ac4e4b11a (patch) | |
tree | 95fba51bd9564d3b39bd884a708a3fc3e43f7a46 | |
parent | 40882a0c662308848978dfc119e2d5cf2c3857f2 (diff) | |
parent | 9f6226486e611135bd67b3374322ba04eb18d9da (diff) |
Merge remote-tracking branch 'remotes/origin/feature/nc24-lock' into develop
-rw-r--r-- | controller/editorapicontroller.php | 10 |
1 files changed, 9 insertions, 1 deletions
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]); |