roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ghu...@apache.org
Subject svn commit: r1546955 - in /roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets: PageServlet.java SearchServlet.java
Date Mon, 02 Dec 2013 10:57:56 GMT
Author: ghuber
Date: Mon Dec  2 10:57:56 2013
New Revision: 1546955

URL: http://svn.apache.org/r1546955
Log:
Do not check for reload on .css stuff

Modified:
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
    roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java?rev=1546955&r1=1546954&r2=1546955&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/PageServlet.java
Mon Dec  2 10:57:56 2013
@@ -206,7 +206,8 @@ public class PageServlet extends HttpSer
                 && !weblog.getEditorTheme()
                         .equals(WeblogTemplate.ACTION_CUSTOM)
                 && (pageRequest.getPathInfo() == null || pageRequest
-                        .getPathInfo() != null)) {
+                        .getPathInfo() != null
+                        && !pageRequest.getPathInfo().endsWith(".css"))) {
             try {
                 ThemeManager manager = WebloggerFactory.getWeblogger()
                         .getThemeManager();

Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java?rev=1546955&r1=1546954&r2=1546955&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
(original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/servlets/SearchServlet.java
Mon Dec  2 10:57:56 2013
@@ -112,7 +112,8 @@ public class SearchServlet extends HttpS
                 && !weblog.getEditorTheme()
                         .equals(WeblogTemplate.ACTION_CUSTOM)
                 && (searchRequest.getPathInfo() == null || searchRequest
-                        .getPathInfo() != null)) {
+                        .getPathInfo() != null
+                        && !searchRequest.getPathInfo().endsWith(".css"))) {
 
             try {
                 ThemeManager manager = WebloggerFactory.getWeblogger()



Mime
View raw message