From 66ac2f9817618eebd8306bd652f2076450080a33 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 7 Feb 2011 19:53:12 +0000
Subject: [PATCH] Don't get individual moniker if preferred title is populated

---
 .../body/individual/individual--foaf-person.ftl  | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
index 5fd89ced..cc5cc81f 100644
--- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
+++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
@@ -103,16 +103,12 @@
                         
                     <#-- Moniker / Preferred Title -->
                     <#-- Use Preferred Title over Moniker if it is populated -->
-                    <#assign preferredTitle = (propertyGroups.getProperty("${core}preferredTitle").firstValue)! />
-                    <#assign moniker = individual.moniker>
-                    <#if preferredTitle?has_content || moniker?has_content>
-                        <span class="preferred-title">
-                            <#if preferredTitle?has_content>
-                                ${preferredTitle}
-                            <#else>
-                                ${moniker}
-                            </#if>
-                        </span>
+                    <#assign title = (propertyGroups.getProperty("${core}preferredTitle").firstValue)! />
+                    <#if ! title?has_content>
+                        <#assign title = individual.moniker>
+                    </#if>
+                    <#if title?has_content>
+                        <span class="preferred-title">${title}</span>
                     </#if>
                 </h1>
             </#if>