Using the navroot in 359a10d introduced a bug when the plonesite used…

… VHM: links to the mail_password_form on login_form contained the portal's path too. eg. plone.org/Plone/mail_password_form fixed by using navigationRootUrl which respects VHM settings
plone · Jul 18, 2014 · a72a9c1 · a72a9c1 · frisi · Jul 18, 2014
1 parent b31e882
commit a72a9c1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Products/CMFPlone/skins/plone_login/login_form.cpt b/Products/CMFPlone/skins/plone_login/login_form.cpt
@@ -24,7 +24,7 @@
         <metal:login define-macro="login"
             tal:define="auth nocall:context/acl_users/credentials_cookie_auth|context/cookie_authentication|nothing;
                         plone context/@@plone;
-                        nav_root plone/navigationRootPath;
+                        nav_root plone/navigationRootUrl;
                         isURLInPortal nocall:context/portal_url/isURLInPortal;
                         login_template_ids python:'login login_success login_password login_failed login_form logged_in logout logged_out registered mail_password mail_password_form register require_login member_search_results pwreset_finish localhost'.split();
                         came_from request/came_from|request/HTTP_REFERER|nothing;

diff --git a/docs/CHANGES.rst b/docs/CHANGES.rst
@@ -8,6 +8,9 @@ Changelog
 4.3.4 (unreleased)
 ------------------
 
+- Fix link to the mail_password_form on the login_form for sites using VHM
+  [fRiSi]
+
 - folder_position script: make position and id optional.  Default
   position to 'ordered' and id to None, which means: do nothing.
   plone.folder 1.0.5 allows this, making it possible to simply reverse
@@ -24,7 +27,7 @@ Changelog
 - Fix JavaScript to work with recent jQuery (>= 1.9) versions.
   [thet]
 
-- Improve event_view - do not show time when user specifies the same start and 
+- Improve event_view - do not show time when user specifies the same start and
   end time for an event.
   [spereverde]
 
@@ -221,7 +224,7 @@ Changelog
 - Test for #7627 (https://dev.plone.org/ticket/7627)
 
 4.3rc1 (released)
--------------------
+-----------------
 
 - add overlay for folder default page folder factories link
   [vangheem]