Merge pull request #174 from silverstripeltd/pulls/update-grant-metho…

…d-fix Bugfix: Check for active controller before access getRequest()
silverstripe · Aug 7, 2022 · 4810235 · 4810235
2 parents ce0b934 + 07487f8
commit 4810235
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/Extensions/ShareDraftContentFileShortcodeProviderExtension.php b/src/Extensions/ShareDraftContentFileShortcodeProviderExtension.php
@@ -20,16 +20,24 @@ public function updateGrant(bool &$grant, ?File $record = null, ?array $args = n
         if ($grant) {
             return;
         }
-        $session = $session = Controller::curr()->getRequest()->getSession();
+        if (!Controller::has_curr()) {
+            return;
+        }
+
+        $session = Controller::curr()->getRequest()->getSession();
+
         if (!$session) {
             return;
         }
+
         if (!ShareDraftController::getIsViewingPreview()) {
             return;
         }
+
         if (!$record && $args) {
             $record = FileShortcodeProvider::find_shortcode_record($args);
         }
+
         if ($record) {
             $grant = !$record->hasRestrictedAccess();
         }