From 4eaef78930c64a7729c9971f739f2fefc3a62214 Mon Sep 17 00:00:00 2001
From: Brian Jones <bjones86@uwo.ca>
Date: Fri, 4 Mar 2016 09:37:50 -0500
Subject: [PATCH] SAK-30450 regression: the title attribute should show the
 long version in site tabs

---
 .../portal/charon/site/PortalSiteHelperImpl.java       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/site/PortalSiteHelperImpl.java b/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/site/PortalSiteHelperImpl.java
index e78aa2d1f8de..dcf019c187e2 100644
--- a/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/site/PortalSiteHelperImpl.java
+++ b/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/site/PortalSiteHelperImpl.java
@@ -385,11 +385,11 @@ public Map convertSiteToMap(HttpServletRequest req, Site s, String prefix,
 						.equals(myWorkspaceSiteId))));
 		
 		// SAK-29138
-		m.put( "siteTitleNotTruncated", getUserSpecificSiteTitle( s, false ) );
-
-		String siteTitle = getUserSpecificSiteTitle( s );
-		m.put( "siteTitle", siteTitle );
-		m.put( "fullTitle", siteTitle );
+		String siteTitleTruncated = getUserSpecificSiteTitle( s, true );
+		String siteTitleNotTruncated = getUserSpecificSiteTitle( s, false );
+		m.put( "siteTitleNotTruncated", siteTitleNotTruncated );
+		m.put( "siteTitle", siteTitleTruncated );
+		m.put( "fullTitle", siteTitleNotTruncated );
 		
 		m.put("siteDescription", s.getHtmlDescription());