Fix to change password form on account page

silvershop · Jul 6, 2016 · 0233505 · 0233505
1 parent d3a0934
commit 0233505
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/code/account/AccountPage.php b/code/account/AccountPage.php
@@ -225,7 +225,17 @@ public function EditAccountForm()
 
     public function ChangePasswordForm()
     {
+        /** @var ChangePasswordForm $form */
         $form = ChangePasswordForm::create($this, "ChangePasswordForm");
+
+        // The default form tries to redirect to /account/login which doesn't exist
+        $backURL = $form->Fields()->fieldByName('BackURL');
+        if (!$backURL) {
+            $backURL = new HiddenField('BackURL', 'BackURL');
+            $form->Fields()->push($backURL);
+        }
+        $backURL->setValue($this->Link('editprofile'));
+
         $this->extend('updateChangePasswordForm', $form);
         $this->data()->extend('updateChangePasswordForm', $form);