Merge branch '2.7' into 2

silverstripe · Aug 31, 2022 · cf15383 · cf15383
2 parents bbb62b3 + 4810235
commit cf15383
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();
         }