Merge pull request web2py#1525 from michele-comitini/confirm_registra…

…tion_redirect_fix keep the _next while doing the redirect
maxslimmer · Nov 14, 2016 · 091d9c7 · 091d9c7
2 parents bebdbd9 + 6b1225d
commit 091d9c7
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/gluon/tools.py b/gluon/tools.py
@@ -3672,7 +3672,12 @@ def confirm_registration(self,
                 key = request.args[-1]
             if key:
                 session._reset_password_key = key
-                redirect(self.url(args='confirm_registration'))
+                if next:
+                    redirect_vars = {'_next': next}
+                else:
+                    redirect_vars = {}
+                redirect(self.url(args='confirm_registration',
+                                  vars=redirect_vars))
             else:
                 key = session._reset_password_key
         else:
@@ -7067,4 +7072,4 @@ def save(self, options):
 
 if __name__ == '__main__':
     import doctest
-    doctest.testmod()
+    doctest.testmod()