Merge pull request sakaiproject#821 from csev/SAK-29626

SAK-29626 - Fix a missing former value for the chosen icon.
jayrp11 · Jul 7, 2015 · 952308a · 952308a
2 parents a021dd8 + 8c5d43e
commit 952308a
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/web/web-portlet/src/java/org/sakaiproject/portlets/PortletIFrame.java b/web/web-portlet/src/java/org/sakaiproject/portlets/PortletIFrame.java
@@ -569,6 +569,8 @@ public void doEdit(RenderRequest request, RenderResponse response)
             Properties config = getAllProperties(placement);
             String special = getSpecial(config);
 			context.put("title", validator.escapeHtml(placement.getTitle(), false));
+			String fa_icon = placement.getPlacementConfig().getProperty("imsti.fa_icon");
+			if ( fa_icon != null ) context.put("fa_icon", fa_icon );
 			String source = placement.getPlacementConfig().getProperty(SOURCE);
 			if ( source == null ) source = "";
 			if ( special == null ) context.put("source",source);