Merge pull request 'fix: unknown author in version history + correct …

…ids' from hotfix/first-version-author into develop Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/onlyoffice-nextcloud/pulls/34
ONLYOFFICE · Feb 5, 2025 · 3ec8855 · 3ec8855
2 parents 8a56ac3 + 0e96e19
commit 3ec8855
Showing 1 changed file with 21 additions and 10 deletions.
diff --git a/lib/Controller/EditorController.php b/lib/Controller/EditorController.php
@@ -955,10 +955,19 @@ public function history($fileId) {
                     "name" => $author["name"],
                 ];
             } else {
-                $authorName = !empty($this->config->getUnknownAuthor()) ? $this->config->getUnknownAuthor() : $owner->getDisplayName();
-                $historyItem["user"] = [
-                    "name" => $authorName,
-                ];
+                if (!empty($this->config->getUnknownAuthor()) && $versionNum !== 1) {
+                    $authorName = $this->config->getUnknownAuthor();
+                    $historyItem["user"] = [
+                        "name" => $authorName,
+                    ];
+                } else {
+                    $authorName = $owner->getDisplayName();
+                    $authorId = $owner->getUID();
+                    $historyItem["user"] = [
+                        "id" => $this->buildUserId($authorId),
+                        "name" => $authorName,
+                    ];
+                }
             }
 
             $historyData = FileVersions::getHistoryData($ownerId, $file->getFileInfo(), $versionId, $prevVersion);
@@ -984,15 +993,17 @@ public function history($fileId) {
         $versionId = $file->getFileInfo()->getMtime();
 
         $author = FileVersions::getAuthor($ownerId, $file->getFileInfo(), $versionId);
-        if ($author !== null) {
+        if (!empty($this->config->getUnknownAuthor()) && $versionNum !== 1) {
+            $authorName = $this->config->getUnknownAuthor();
             $historyItem["user"] = [
-                "id" => $this->buildUserId($author["id"]),
-                "name" => $author["name"]
+                "name" => $authorName,
             ];
-        } elseif ($owner !== null) {
+        } else {
+            $authorName = $owner->getDisplayName();
+            $authorId = $owner->getUID();
             $historyItem["user"] = [
-                "id" => $this->buildUserId($ownerId),
-                "name" => $owner->getDisplayName()
+                "id" => $this->buildUserId($authorId),
+                "name" => $authorName,
             ];
         }