Merge pull request #928 from creative-commoners/pulls/8.0/ctrl-curr

ENH Stop using Controller::has_curr()
tractorcow-farm · Feb 16, 2025 · 1339a9d · 1339a9d
2 parents 0b5e35a + 5bb6e6f
commit 1339a9d
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/Extension/Traits/FluentObjectTrait.php b/src/Extension/Traits/FluentObjectTrait.php
@@ -118,8 +118,7 @@ protected function updateFluentCMSFields(FieldList $fields)
 
         // Augment Localisation tab with clickable locale links to allow easy navigation between model localisations
         if ($owner->hasExtension(CMSEditLinkExtension::class)) {
-            $controller = Controller::has_curr() ? Controller::curr() : null;
-            $request = $controller?->getRequest();
+            $request = Controller::curr()?->getRequest();
 
             // Pass getVars separately so we can process them later
             $params = $request?->getVars() ?? [];