ENH Add canView() checks to generateLinkDescription() for relations

creative-commoners · Sep 26, 2023 · 879a3f6 · 879a3f6
1 parent 7a16b8b
commit 879a3f6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/_config.php b/_config.php
@@ -5,5 +5,4 @@
 
 // Avoid creating global variables
 call_user_func(function () {
-
 });
diff --git a/src/Models/FileLink.php b/src/Models/FileLink.php
@@ -28,7 +28,11 @@ public function generateLinkDescription(array $data): string
 
         $file = File::get()->byID($fileId);
 
-        return $file?->getFilename() ?? '';
+        if (!$file || !$file->canView()) {
+            return '';
+        }
+
+        return $file->getFilename();
     }
 
     public function LinkTypeHandlerName(): string

diff --git a/src/Models/SiteTreeLink.php b/src/Models/SiteTreeLink.php
@@ -41,7 +41,7 @@ public function generateLinkDescription(array $data): string
         /** @var SiteTree $page */
         $page = SiteTree::get()->byID($pageId);
 
-        if (!$page?->exists()) {
+        if (!$page?->exists() || !$page->canView()) {
             return '';
         }