Merge branch 'QA_4_8'

Closes #15280 Signed-off-by: William Desportes <williamdes@wdes.fr>
2019-05-20 14:22:55 +02:00 · 2019-05-20 14:22:55 +02:00 · c1186dcdba
commit c1186dcdba
parent de4bc0751b 3002944e24
2 changed files with 3 additions and 2 deletions
--- a/3
+++ b/3
@ -139,7 +139,8 @@ phpMyAdmin - ChangeLog
 - issue #14252 Fixed DisableIS and database tree list (new database missing when refreshing the list)
 - issue #14621 Removed "Propose table structure" on MySQL 8.0
 - issue        Fixed editing of virtual columns on PerconaDB
- issue #13854 Fixed column options are ignored for GENERATED/VIRTUAL/STORED columns 
+- issue #13854 Fixed column options are ignored for GENERATED/VIRTUAL/STORED columns
+- issue #15262 Fixed incorrect display of charset column (raw html)

 4.8.5 (2019-01-25)
 - issue        Developer debug data was saved to the PHP error log
--- a/templates/database/structure/structure_table_row.twig
+++ b/templates/database/structure/structure_table_row.twig
@ -141,7 +141,7 @@
        {% if not (show_charset > 1) %}
            {% if charset|length > 0 %}
                <td class="nowrap">
-                    {{ charset }}
+                    {{ charset|raw }}
                </td>
            {% endif %}
        {% endif %}