Reintegrated fixes from branch 1.2.1 (2116,2118,2119)

- HTML attributes > 64 Kb
- Log of notification displayed as HTML

SVN:trunk[2121]
This commit is contained in:
Romain Quetiez
2012-07-04 09:34:49 +00:00
parent 9bfd7ae435
commit 1757554f37
3 changed files with 96 additions and 8 deletions

View File

@@ -1719,7 +1719,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)