FIX Don't rely on session for current record ID (#272)

silverstripe · Dec 12, 2024 · 6cccd25 · 6cccd25
1 parent b501926
commit 6cccd25
Showing 1 changed file with 21 additions and 3 deletions.
diff --git a/src/Extensions/ShareDraftContentControllerExtension.php b/src/Extensions/ShareDraftContentControllerExtension.php
@@ -53,9 +53,27 @@ private function getShareTokenLink(object $record, Member $member): ?string
      */
     public function getShareDraftLinkAction()
     {
-        if ($this->owner->config()->get('url_segment')) {
-            return $this->owner->Link('MakeShareDraftLink');
+        $owner = $this->getOwner();
+        if (!$owner->config()->get('url_segment')) {
+            return '';
         }
-        return '';
+        $id = $this->getRecordID();
+        if (!$id) {
+            return '';
+        }
+        return $owner->Link(Controller::join_links('MakeShareDraftLink', $id));
+    }
+
+    private function getRecordID(): ?int
+    {
+        $owner = $this->getOwner();
+        if ($owner->hasMethod('currentRecordID')) {
+            return $owner->currentRecordID();
+        }
+        // Could be a non-LeftAndMain controller, since the extension is applied directly to Controller
+        if ($owner->hasMethod('CurrentPage')) {
+            return $owner->CurrentPage()?->ID;
+        }
+        return null;
     }
 }