gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unescaped string in table structure view

Browse Source 
https://github.com/phpmyadmin/phpmyadmin/issues/14374#issuecomment-410017440

Introduced by commit 5d0fd81e67

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
This commit is contained in:
Maurício Meneghini Fauth 2018-08-28 02:41:27 -03:00
parent 2575b9720d
commit 5455897555
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/classes/Controllers/Table/TableStructureController.php
View File

@ -1323,14 +1323,6 @@ class TableStructureController extends TableController
$attributes[$rownum] = 'on update CURRENT_TIMESTAMP';
}
if (!isset($field['Default'])) {
if ($field['Null'] == 'YES') {
$field = array_merge($field, ['Default' => '<em>NULL</em>']);
}
} else {
$field = array_merge($field, ['Default' => $field['Default']]);
}
$displayed_fields[$rownum] = new \stdClass();
$displayed_fields[$rownum]->text = $field['Field'];
$displayed_fields[$rownum]->icon = "";

4
templates/table/structure/display_structure.twig
View File

@ -83,8 +83,10 @@
{% if extracted_columnspec['type'] == 'bit' %}
{{ row['Default']|convert_bit_default_value }}
{% else %}
{{ row['Default']|raw }}
{{ row['Default'] }}
{% endif %}
{% elseif row['Null'] == 'YES' %}
<em>NULL</em>
{% else %}
<em>{% trans %}None{% context %}None for default{% endtrans %}</em>
{% endif %}