From 01b41ac1a07ec56fe213fd51beadaee1cbfab7f4 Mon Sep 17 00:00:00 2001 From: Jonathon Menz Date: Fri, 23 Aug 2019 10:57:23 -0700 Subject: [PATCH] Fix logout form return destination --- src/Extension/BetterNavigatorExtension.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Extension/BetterNavigatorExtension.php b/src/Extension/BetterNavigatorExtension.php index 43e97ce..a68f88e 100644 --- a/src/Extension/BetterNavigatorExtension.php +++ b/src/Extension/BetterNavigatorExtension.php @@ -114,13 +114,15 @@ class BetterNavigatorExtension extends DataExtension // Add other data for template $backURL = '?BackURL=' . urlencode($this->owner->Link()); + $logoutForm = LogoutForm::create($this->owner)->setName('BetterNavigatorLogoutForm'); + $logoutForm->Fields()->fieldByName('BackURL')->setValue($this->owner->Link()); $bNData = array_merge($nav, [ 'Member' => $member, 'Stage' => Versioned::get_stage(), 'Viewing' => $viewing, // What we're viewing doesn't necessarily align with the active Stage 'LoginLink' => Controller::join_links(Director::absoluteBaseURL(), Security::config()->login_url, $backURL), 'LogoutLink' => Controller::join_links(Director::absoluteBaseURL() . Security::config()->logout_url, $backURL), - 'LogoutForm' => LogoutForm::create($this->owner)->setName('BetterNavigatorLogoutForm'), + 'LogoutForm' => $logoutForm, 'EditLink' => $editLink, 'Mode' => Director::get_environment_type(), 'IsDeveloper' => $isDeveloper