Merge pull request sakaiproject#142 from ktakacs/KNL-1327

KNL-1327 check for neo-prefix
yuyilin · Feb 5, 2015 · 2f7154d · 2f7154d
2 parents 7161f31 + 896dbaa
commit 2f7154d
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/HtmlPageFilter.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/HtmlPageFilter.java
@@ -131,6 +131,14 @@ private String getSiteSkin(Entity entity) {
 				siteSkin = site.getSkin();
 			}
 		}
+
+		String neoPrefix = serverConfigurationService.getString("portal.neoprefix", "neo-");
+		String portalTemplate = serverConfigurationService.getString("portal.templates", "neoskin");
+
+		if ("neoskin".equals(portalTemplate) && !siteSkin.startsWith(neoPrefix)) {
+			siteSkin = neoPrefix + siteSkin;
+		}
+
 		return siteSkin;
 	}