| commit | 05ac35f399ce0df88cb81a4c251d2822ab6042c6 | [log] [tgz] |
|---|---|---|
| author | Glen Mazza <gmazza@apache.org> | Fri Sep 26 20:13:03 2014 +0000 |
| committer | Glen Mazza <gmazza@apache.org> | Fri Sep 26 20:13:03 2014 +0000 |
| tree | 5fa6eb7a574f2fce7e6d3d6e606dea1c25ac302b | |
| parent | 4eec17d95ad610d33353c0cc5af921140ad64546 [diff] |
ROL-2051 fall back to standard rendition when others requested and unavailable -- fixing this time for custom themes, did earlier for shared. git-svn-id: https://svn.apache.org/repos/asf/roller/trunk@1627875 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java index 388df68..fa3acb5 100644 --- a/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java +++ b/app/src/main/java/org/apache/roller/weblogger/ui/rendering/velocity/RollerResourceLoader.java
@@ -89,6 +89,10 @@ } 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(); }