Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/ONLYOFFICE/onlyoffice-nextcloud.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntipkin-A <Artem.Antipkin@onlyoffice.com>2022-05-04 18:34:41 +0300
committerAntipkin-A <Artem.Antipkin@onlyoffice.com>2022-05-04 18:34:41 +0300
commit9f6226486e611135bd67b3374322ba04eb18d9da (patch)
tree607761ec47494ba450f739d59ab98d2f16178171
parent9678ac9715cb2f54d8ba8982b03241d9d60dcb23 (diff)
fixed check lock (nc24)feature/nc24-lock
-rw-r--r--controller/editorapicontroller.php10
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]);