From b986f63a67cba3f8b679f8509c418744d612fb92 Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Fri, 29 Jun 2012 15:11:35 +0000
Subject: [PATCH] Bug fix: $this->label(attcode)$ used inside Email
 Notifications should not contain HTML entities since this not an HTML
 fragment.

SVN:1.2[2117]
---
 core/dbobject.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/dbobject.class.php b/core/dbobject.class.php
index 806134bfd..b86ef1cce 100644
--- a/core/dbobject.class.php
+++ b/core/dbobject.class.php
@@ -1661,7 +1661,7 @@ abstract class DBObject
 					// #@# Note: This has been proven to be quite slow, this can slow down bulk load
 					$sAsHtml = $this->GetAsHtml($sAttCode);
 					$aScalarArgs[$sArgName.'->html('.$sAttCode.')'] = $sAsHtml;
-					$aScalarArgs[$sArgName.'->label('.$sAttCode.')'] = strip_tags($sAsHtml);
+					$aScalarArgs[$sArgName.'->label('.$sAttCode.')'] = $this->GetEditValue($sAttCode); // "Nice" display value, but without HTML tags and entities
 				}
 				// Do something for case logs... quick N' dirty...
 				if ($aScalarArgs[$sArgName.'->'.$sAttCode] instanceof ormCaseLog)