From c01dc9bf65c642a11fd8726bbdb94042b048edaf Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 27 Jan 2011 21:09:23 +0000
Subject: [PATCH] Fixed template error on person page when positions or
 research areas are null

---
 .../body/partials/individual/lib-properties.ftl   | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
index 72ead8469..9713c1f0f 100644
--- a/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
+++ b/webapp/web/templates/freemarker/body/partials/individual/lib-properties.ftl
@@ -33,15 +33,14 @@
     </#list>
 </#macro>
 
-<#-- Full object property listing, including heading and ul wrapper element. -->
+<#-- Full object property listing, including heading and ul wrapper element. 
+Assumes property is non-null. -->
 <#macro objectPropertyListing property editable template=property.template>
-    <#if property?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
-        <#local localName = property.localName>
-        <h2 id="${localName}">${property.name?capitalize} <@addLink property editable /></h2>
-        <ul id="individual-${localName}" role="list">
-            <@p.objectProperty property editable />
-        </ul>
-    </#if>
+    <#local localName = property.localName>
+    <h2 id="${localName}">${property.name?capitalize} <@addLink property editable /></h2>
+    <ul id="individual-${localName}" role="list">
+        <@p.objectProperty property editable />
+    </ul>
 </#macro>
 
 <#macro objectPropertyList property editable statements=property.statements template=property.template>