You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2007/06/21 22:43:01 UTC
svn commit: r549606 -
/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
Author: agilliland
Date: Thu Jun 21 13:43:00 2007
New Revision: 549606
URL: http://svn.apache.org/viewvc?view=rev&rev=549606
Log:
we need to set the request locale after doing page validation because otherwise it's possible for someone who has unchecked the 'show all langs' option to be seen as having an invalid page request.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java?view=diff&rev=549606&r1=549605&r2=549606
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java (original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java Thu Jun 21 13:43:00 2007
@@ -219,6 +219,7 @@
}
}
+ log.debug("Looking for template to use for rendering");
// figure out what template to use
ThemeTemplate page = null;
@@ -287,11 +288,6 @@
log.debug("page found, dealing with it");
- // do we need to force a specific locale for the request?
- if(pageRequest.getLocale() == null && !weblog.isShowAllLangs()) {
- pageRequest.setLocale(weblog.getLocale());
- }
-
// validation. make sure that request input makes sense.
boolean invalid = false;
if(pageRequest.getWeblogPageName() != null && page.isHidden()) {
@@ -341,9 +337,16 @@
if(invalid) {
+ log.debug("page failed validation, bailing out");
if(!response.isCommitted()) response.reset();
response.sendError(HttpServletResponse.SC_NOT_FOUND);
return;
+ }
+
+
+ // do we need to force a specific locale for the request?
+ if(pageRequest.getLocale() == null && !weblog.isShowAllLangs()) {
+ pageRequest.setLocale(weblog.getLocale());
}