From df9eb65144fa93eb554f3f86f86f4fda7a429c21 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Thu, 14 Feb 2013 13:09:11 +0100 Subject: [PATCH] Fixed register and new password link when the CMS's base dir is not the root / --- .../cms/src/modules/user/user_new_password_cms_execution.e | 2 +- .../cms/src/modules/user/user_register_cms_execution.e | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/draft/application/cms/src/modules/user/user_new_password_cms_execution.e b/draft/application/cms/src/modules/user/user_new_password_cms_execution.e index e5f6801b..97f372ff 100644 --- a/draft/application/cms/src/modules/user/user_new_password_cms_execution.e +++ b/draft/application/cms/src/modules/user/user_new_password_cms_execution.e @@ -32,7 +32,7 @@ feature -- Execution initialize_primary_tabs (u) if u /= Void then if attached u.email as l_email then - f := new_password_form (request.path_info, "new-password") + f := new_password_form (url (request.path_info, Void), "new-password") b.append ("Password reset instructions will be mailed to " + l_email + ". You must " + link ("log out", "/user/logout", Void) + " to use the password reset link in the e-mail.") b.append (f.to_html (theme)) else diff --git a/draft/application/cms/src/modules/user/user_register_cms_execution.e b/draft/application/cms/src/modules/user/user_register_cms_execution.e index 60904529..95395022 100644 --- a/draft/application/cms/src/modules/user/user_register_cms_execution.e +++ b/draft/application/cms/src/modules/user/user_register_cms_execution.e @@ -34,7 +34,7 @@ feature -- Execution b.append ("You are already " + link ("signed in", "/user", Void) + ", please " + link ("signout", "/user/logout", Void) + " before trying to " + link ("register a new account", "/account/register", Void) + ".") set_redirection (url ("/user", Void)) else - f := registration_form (request.path_info, "reg") + f := registration_form (url (request.path_info, Void), "reg") if request.is_post_request_method then create fd.make (request, f)