Author: jkoster
Date: 2009-06-05 16:25:39 +0200 (Fri, 05 Jun 2009)
New Revision: 35779
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/edit-webapp/src/webapp/editors/index.jsp
Log:
CMSC-1424 - Editors login stacktraces when user does not exist in user table
but exists only in mmbaseusers table
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/edit-webapp/src/webapp/editors/index.jsp
===================================================================
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/edit-webapp/src/webapp/editors/index.jsp
2009-06-05 14:23:27 UTC (rev 35778)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/edit-webapp/src/webapp/editors/index.jsp
2009-06-05 14:25:39 UTC (rev 35779)
@@ -1,5 +1,5 @@
-<%...@page language="java" contentType="text/html;charset=UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd";>
+<%...@page language="java" contentType="text/html;charset=UTF-8"
+%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd";>
<%...@include file="globals.jsp" %>
<mm:import externid="bottomurl" from="parameters">dashboard.jsp</mm:import>
@@ -14,13 +14,16 @@
</c:if>
<mm:setfield name="language">${language}</mm:setfield>
</c:if>
-
</mm:listnodes>
-
+ <%-- The language variable can only be empty when the user does not exist
in the users table
+ and does exists in the mmbaseusers table --%>
+ <c:if test="${empty language}">
+ <c:set var="language" value="en"/>
+ </c:if>
+
<mm:write referid="language" jspvar="lang" vartype="String">
<%request.getSession().setAttribute("org.apache.struts.action.LOCALE",
new Locale(lang));%>
-
</mm:write>
</mm:cloud>
@@ -49,5 +52,4 @@
</html:html>
</fmt:bundle>
</mm:cloud>
-</mm:locale>
-
+</mm:locale>
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
