roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agillil...@apache.org
Subject svn commit: r549613 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
Date Thu, 21 Jun 2007 21:05:00 GMT
Author: agilliland
Date: Thu Jun 21 14:04:58 2007
New Revision: 549613

URL: http://svn.apache.org/viewvc?view=rev&rev=549613
Log:
feed servlet also needs to do validation before forcing a request locale on entries not 'showing
all langs'.


Modified:
    roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java?view=diff&rev=549613&r1=549612&r2=549613
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
(original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
Thu Jun 21 14:04:58 2007
@@ -171,11 +171,6 @@
         }
         
         
-        // do we need to force a specific locale for the request?
-        if(feedRequest.getLocale() == null && !weblog.isShowAllLangs()) {
-            feedRequest.setLocale(weblog.getLocale());
-        }
-        
         // validation.  make sure that request input makes sense.
         boolean invalid = false;
         if(feedRequest.getLocale() != null) {
@@ -210,6 +205,11 @@
             return;
         }
         
+        
+        // do we need to force a specific locale for the request?
+        if(feedRequest.getLocale() == null && !weblog.isShowAllLangs()) {
+            feedRequest.setLocale(weblog.getLocale());
+        }
         
         // looks like we need to render content
         HashMap model = new HashMap();



Mime
View raw message