From 896dbaadc54f6de6c02b2af634741ba146cfc2cd Mon Sep 17 00:00:00 2001
From: Kevin Takacs <ktakacs@rsmart.com>
Date: Wed, 4 Feb 2015 11:42:54 -0700
Subject: [PATCH] KNL-1327 check for neo-prefix

---
 .../org/sakaiproject/content/impl/HtmlPageFilter.java     | 8 ++++++++
 1 file changed, 8 insertions(+)

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
index 0594903290a5..333ce072cdfa 100644
--- 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;
 	}