You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2014/09/26 22:13:03 UTC
svn commit: r1627875 -
/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
Author: gmazza
Date: Fri Sep 26 20:13:03 2014
New Revision: 1627875
URL: http://svn.apache.org/r1627875
Log:
ROL-2051 fall back to standard rendition when others requested and unavailable -- fixing this time for custom themes, did earlier for shared.
Modified:
roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
Modified: roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
URL: http://svn.apache.org/viewvc/roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java?rev=1627875&r1=1627874&r2=1627875&view=diff
==============================================================================
--- roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java (original)
+++ roller/trunk/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java Fri Sep 26 20:13:03 2014
@@ -89,6 +89,10 @@ public class RollerResourceLoader extend
}
String contents = "";
TemplateRendition templateCode = page.getTemplateRendition(renditionType);
+ if (templateCode == null && renditionType != RenditionType.STANDARD) {
+ // fall back to standard rendition if mobile or other unavailable
+ templateCode = page.getTemplateRendition(RenditionType.STANDARD);
+ }
if (templateCode != null) {
contents = templateCode.getTemplate();
}