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 2006/10/05 23:25:18 UTC
svn commit: r453386 -
/incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/URLModel.java
Author: agilliland
Date: Thu Oct 5 14:25:18 2006
New Revision: 453386
URL: http://svn.apache.org/viewvc?view=rev&rev=453386
Log:
reverting change to URLModel.themeResource() methods. unfortunately, these methods can't be changed to point to the weblog resource path because it would break weblogs using themes customized from 3.0 themes.
Modified:
incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/URLModel.java
Modified: incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/URLModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/URLModel.java?view=diff&rev=453386&r1=453385&r2=453386
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/URLModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/rendering/model/URLModel.java Thu Oct 5 14:25:18 2006
@@ -125,13 +125,14 @@
public String themeResource(String theme, String filePath) {
- // starting in Roller 3.1 even theme resources go through ResourceServlet
- return resource(filePath);
+ return getSite()+"/themes/"+theme+"/"+filePath;
}
public String themeResource(String theme, String filePath, boolean absolute) {
- // starting in Roller 3.1 even theme resources go through ResourceServlet
- return resource(filePath);
+ if (absolute) {
+ return getAbsoluteSite()+"/themes/"+theme+"/"+filePath;
+ }
+ return themeResource(theme, filePath);
}
public String getHome() {