Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurício Meneghini Fauth <mauriciofauth@gmail.com>2018-05-11 02:07:20 +0300
committerMaurício Meneghini Fauth <mauriciofauth@gmail.com>2018-05-11 02:07:20 +0300
commit4f77afe84c6db3ed4bcc90b2f4e8643e08023598 (patch)
tree0bae354499a770f032a35c8efabe0c96a1bf755a /templates
parent3e62d730624bc69c830f1ee5cf65eae98c6e1665 (diff)
Fix double escaping in column comments
Fixes #14266 Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
Diffstat (limited to 'templates')
-rw-r--r--templates/columns_definitions/column_comment.twig2
-rw-r--r--templates/table/structure/display_structure.twig2
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/columns_definitions/column_comment.twig b/templates/columns_definitions/column_comment.twig
index e5e7ca501b..7414e10a36 100644
--- a/templates/columns_definitions/column_comment.twig
+++ b/templates/columns_definitions/column_comment.twig
@@ -3,5 +3,5 @@
name="field_comments[{{ column_number }}]"
size="12"
maxlength="{{ max_length }}"
- value="{{ value }}"
+ value="{{ value|raw }}"
class="textfield" />
diff --git a/templates/table/structure/display_structure.twig b/templates/table/structure/display_structure.twig
index 79875f6655..54595957d6 100644
--- a/templates/table/structure/display_structure.twig
+++ b/templates/table/structure/display_structure.twig
@@ -54,7 +54,7 @@
{{- field_name|raw -}}
</span>
{%- endset %}
- {% set comments = comments_map[row['Field']]|e %}
+ {% set comments = comments_map[row['Field']] %}
{% endif %}
{% if primary and primary.hasColumn(field_name) %}