more _target_path changes

xmmedia · Feb 6, 2020 · 2f33776 · 2f33776
1 parent afec211
commit 2f33776
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/Controller/ActivateController.php b/Controller/ActivateController.php
@@ -102,7 +102,13 @@ protected function getTargetPath(Request $request)
         if (!$targetPath) {
             $targetPath = $request->query->get('target_path');
         }
+        if (!$targetPath) {
+            $targetPath = $request->request->get('_target_path');
+        }
+        if (!$targetPath) {
+            $targetPath = $request->query->get('_target_path');
+        }
 
         return $targetPath;
     }
-}
+}
diff --git a/Listener/ResettingListener.php b/Listener/ResettingListener.php
@@ -111,6 +111,12 @@ protected function getTargetPath(Request $request)
         if (!$targetPath) {
             $targetPath = $request->query->get('target_path');
         }
+        if (!$targetPath) {
+            $targetPath = $request->request->get('_target_path');
+        }
+        if (!$targetPath) {
+            $targetPath = $request->query->get('_target_path');
+        }
 
         return $targetPath;
     }

diff --git a/Resources/views/Activate/activate_content.html.twig b/Resources/views/Activate/activate_content.html.twig
@@ -8,7 +8,7 @@
     {{ form_start(form, { 'action': path('xm_security_activate', {'token': token}) }) }}
 
         {% if target_path is defined %}
-            <input type="hidden" name="target_path" value="{{ target_path }}">
+            <input type="hidden" name="_target_path" value="{{ target_path }}">
         {% endif %}
 
         <div class="field-wrap form-field_wrap">
@@ -26,4 +26,4 @@
             <a href="{{ path('fos_user_security_login') }}" class="form-action form-action_link">{{ 'xm_security.activate.return_to_login'|trans([], 'XMSecurityBundle') }}</a>
         </div>
     {{ form_end(form) }}
-</div>
+</div>