From 12c2b4785dcb8c584b2e065cf5a0870b269fda28 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 15 Feb 2011 15:11:48 +0000
Subject: [PATCH] Merge r2677-2678 from rel-1.2-maint

---
 .../entitycomparison/entityComparisonErrorCommonBody.ftl        | 2 +-
 themes/vivo-basic/templates/page-home.ftl                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonErrorCommonBody.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonErrorCommonBody.ftl
index e5d9db32..c8fa5141 100644
--- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonErrorCommonBody.ftl
+++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonErrorCommonBody.ftl
@@ -2,7 +2,7 @@
 
 <#assign standardVisualizationURLRoot ="/visualization">
 
-<#assign organizationVivoProfileURL = "${urls.base}/individual?uri=${organizationURI?url}">
+<#assign organizationVivoProfileURL = "${urls.base}/individual?uri=${organizationURI}">
 <#assign temporalGraphURL = '${urls.base}${standardVisualizationURLRoot}?vis=${otherVisType}&uri=${organizationURI}&labelField=label'>
 
 <div id="error-container">
diff --git a/themes/vivo-basic/templates/page-home.ftl b/themes/vivo-basic/templates/page-home.ftl
index f03d706b..4156cc0c 100644
--- a/themes/vivo-basic/templates/page-home.ftl
+++ b/themes/vivo-basic/templates/page-home.ftl
@@ -14,7 +14,7 @@
         <#include "menu.ftl">
  
         <#-- vivo-basic continues to display home tab content on the home page -->
-        ${homeTabContent}
+        ${homeTabContent!}
         
         <#include "footer.ftl">
     </body>