diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java index 1147311a4..3e96be365 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/PageController.java @@ -70,9 +70,13 @@ public class PageController extends FreemarkerHttpServlet{ } private String getTemplate(Map mapForTemplate) { - if( mapForTemplate.containsKey("bodyTemplate")) - return (String) mapForTemplate.get("bodyTemplate"); - else + if( mapForTemplate.containsKey("page") ){ + Map page = (Map) mapForTemplate.get("page"); + if( page != null && page.containsKey("bodyTemplate")) + return (String) page.get("bodyTemplate"); + else + return DEFAULT_BODY_TEMPLATE; + }else return DEFAULT_BODY_TEMPLATE; }