diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2016-02-14 23:10:26 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2016-02-14 23:10:26 +0300 |
| commit | 2bae9d90f860f3ccc5598420eb978cafd598451e (patch) | |
| tree | b742afddcfc882de15b9c075522cee4eae680db6 /plugins/CoreVisualizations | |
| parent | 41b579a9d94a05f7c0cb2e42bf7c03c2d374ed95 (diff) | |
merge master => 3.0
Diffstat (limited to 'plugins/CoreVisualizations')
| -rw-r--r-- | plugins/CoreVisualizations/Visualizations/Cloud.php | 2 | ||||
| -rw-r--r-- | plugins/CoreVisualizations/templates/_dataTableViz_tagCloud.twig | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/plugins/CoreVisualizations/Visualizations/Cloud.php b/plugins/CoreVisualizations/Visualizations/Cloud.php index d5a317da25..502411e74c 100644 --- a/plugins/CoreVisualizations/Visualizations/Cloud.php +++ b/plugins/CoreVisualizations/Visualizations/Cloud.php @@ -174,6 +174,8 @@ class Cloud extends Visualization */ private function truncateWordIfNeeded($word) { + $word = Common::unsanitizeInputValue($word); + if (Common::mb_strlen($word) > $this->truncatingLimit) { return Common::mb_substr($word, 0, $this->truncatingLimit - 3) . '...'; } diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_tagCloud.twig b/plugins/CoreVisualizations/templates/_dataTableViz_tagCloud.twig index d7f328b923..d1085287f4 100644 --- a/plugins/CoreVisualizations/templates/_dataTableViz_tagCloud.twig +++ b/plugins/CoreVisualizations/templates/_dataTableViz_tagCloud.twig @@ -1,7 +1,7 @@ {% set cloudColumn = properties.columns_to_display[1] %} <div class="tagCloud"> {% for word,value in cloudValues %} - <span title="{{ value.word }} ({{ value.value }} {{ properties.translations[cloudColumn]|default(cloudColumn) }})" class="word size{{ value.size }} + <span title="{{ value.word|rawSafeDecoded }} ({{ value.value }} {{ properties.translations[cloudColumn]|default(cloudColumn) }})" class="word size{{ value.size }} {# we strike tags with 0 hits #} {% if value.value == 0 %}valueIsZero{% endif %}"> {% if labelMetadata[value.word].url is not sameas(false) %} @@ -10,7 +10,7 @@ {% if labelMetadata[value.word].logo is not sameas(false) %} <img src="{{ labelMetadata[value.word].logo }}" width="{{ value.logoWidth }}" /> {% else %} - {{ value.wordTruncated }} + {{ value.wordTruncated|rawSafeDecoded }} {% endif %} {% if labelMetadata[value.word].url is not sameas(false) %}</a>{% endif %} </span> |