Skip to content

Commit

Permalink
Fixed issue: Html entities not decoded in token list (should be porte…
Browse files Browse the repository at this point in the history
…d to 2.06lts)
  • Loading branch information
LouisGac committed Jul 5, 2016
1 parent 3714fdb commit e3c40b9
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion application/models/TokenDynamic.php
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,8 @@ public function getAttributesForGrid()
$aCustomAttributesCols[] = array(
'header' => $desc,// $aAttributedescriptions->$sColName->description,
'name' => $sColName,
'value'=>'$data->'.$sColName,
//'value'=>'$data->'.$sColName,
'value'=>'html_entity_decode($data->'.$sColName.')',
'headerHtmlOptions'=>array('class' => 'hidden-xs'),
'htmlOptions' => array('class' => 'hidden-xs'),
);
Expand Down

4 comments on commit e3c40b9

@Shnoulle
Copy link
Collaborator

@Shnoulle Shnoulle commented on e3c40b9 Jul 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi don't understand ? You mean : is an attribute have this:

<strong>strong</strong>

You want to show strong and not >strong< ?

I really think we must never show token part with html .

PS : in fact : i don't see real difference, with " and ' too

@LouisGac
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it just applies html_entities_decode, so instead of &lt; it will show <

@Shnoulle
Copy link
Collaborator

@Shnoulle Shnoulle commented on e3c40b9 Jul 5, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, then no change to tag : show with $lt; (in source code).

But : if user entre &lt; why show < ? I think the attribute must be shown like it was in DB no change here.

In fact :
1 < 2 != 1 &lt; 2
But now : user don't see difference

@LouisGac
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

well... A limeService user complained about it. That's why I changed it.

Please sign in to comment.