diff --git a/VERSION b/VERSION index af39cf6e..abdd0b92 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.1-alpha.2+timestamp.2013.02.10.17.11.46 +Version 2.4.1-alpha.2+timestamp.2013.02.10.23.21.45 diff --git a/gluon/tools.py b/gluon/tools.py index 9fc9201f..cdcb8507 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -2269,7 +2269,7 @@ class Auth(object): self.settings.everybody_group_id, form.vars.id) if self.settings.registration_requires_verification: link = self.url( - 'user', args=('verify_email', key), scheme=True) + self.settings.function, args=('verify_email', key), scheme=True) if not self.settings.mailer or \ not self.settings.mailer.send( @@ -2652,7 +2652,7 @@ class Auth(object): def email_reset_password(self, user): reset_password_key = str(int(time.time())) + '-' + web2py_uuid() - link = self.url('user', + link = self.url(self.settings.function, args=('reset_password', reset_password_key), scheme=True) if self.settings.mailer.send(