roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r735813 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/servlets/FeedServlet.java
Date Mon, 19 Jan 2009 21:01:25 GMT
Author: snoopdave
Date: Mon Jan 19 13:01:24 2009
New Revision: 735813

URL: http://svn.apache.org/viewvc?rev=735813&view=rev
Log:
Fix suggested by Greg Huber in ROL-1776
https://issues.apache.org/roller/browse/ROL-1776

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?rev=735813&r1=735812&r2=735813&view=diff
==============================================================================
--- 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
Mon Jan 19 13:01:24 2009
@@ -217,15 +217,15 @@
         try {
             // determine what template to render with
             boolean siteWide = WebloggerRuntimeConfig.isSiteWideWeblog(weblog.getHandle());
-            if ("entries".equals(feedRequest.getType()) && feedRequest.getTerm()
!= null) {
-                pageId = "templates/feeds/site-search-atom.vm";                
+           if (siteWide && "entries".equals(feedRequest.getType()) && feedRequest.getTerm()
!= null) {
+                pageId = "templates/feeds/site-search-atom.vm";
+
+           } else if ("entries".equals(feedRequest.getType()) && feedRequest.getTerm()
!= null) {
+                pageId = "templates/feeds/weblog-search-atom.vm";
 
-            } else if (siteWide && "entries".equals(feedRequest.getType()) &&
feedRequest.getTerm() != null) {
-                pageId = "templates/feeds/weblog-search-atom.vm";                
-                
             } else if (siteWide) {
                 pageId = "templates/feeds/site-"+feedRequest.getType()+"-"+feedRequest.getFormat()+".vm";
-                
+
             } else {
                 pageId = "templates/feeds/weblog-"+feedRequest.getType()+"-"+feedRequest.getFormat()+".vm";
             }



Mime
View raw message