Fix "came_from" support on login error in website mode.

bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web/WebSite_login.xml

@@ -42,17 +42,16 @@
   <tal:block tal:condition="here/portal_skins/updateSkinCookie | nothing"\n
              tal:define="dummy here/setupCurrentSkin;" />\n
   <tal:block tal:define="response request/RESPONSE;\n
-             mtool here/portal_membership;\n
-             isAnon mtool/isAnonymousUser|nothing;">\n
+             came_from python: request.get(\'came_from\') or request.get(\'field_came_from\');\n
+             isAnon here/portal_membership/isAnonymousUser|nothing;">\n
     <tal:block tal:condition="isAnon">\n
       <tal:block tal:define="dummy python: response.expireCookie(\'__ac\', path=\'/\');\n
                  url python: \'%s?portal_status_message=%s\' % (here.absolute_url(), here.Base_translateString(\'Login and/or password is incorrect.\'));\n
-                 url python: request.get(\'came_from\') and  \'%s&amp;came_from=%s\' % (url, request[\'came_from\']) or url;\n
+                 url python: came_from and  \'%s&amp;came_from=%s\' % (url, came_from) or url;\n
                  dummy python: response.redirect(url);" />\n
     </tal:block>\n
     <tal:block tal:condition="not: isAnon">\n
-      <tal:block tal:define="came_from python: request.get(\'came_from\') or request.get(\'field_came_from\') or here.getPermanentURL(here);\n
-                 dummy python: response.redirect(came_from);" />\n
+      <tal:block tal:define="dummy python: response.redirect(came_from or here.getPermanentURL(here));" />\n
     </tal:block>\n
   </tal:block>\n
 </tal:block>\n

bt5/erp5_web/bt/revision

-1100
+1101
\ No newline at end of file