From 073169f6f39b083ea19ca6ae365cf5d641c46e92 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 19 May 2019 22:06:19 +0200 Subject: [PATCH 1/3] Fix key block size (sprintf) Signed-off-by: William Desportes --- libraries/classes/Table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/classes/Table.php b/libraries/classes/Table.php index fa1897259e..419beeefba 100644 --- a/libraries/classes/Table.php +++ b/libraries/classes/Table.php @@ -2121,7 +2121,7 @@ class Table $keyBlockSizes = $index->getKeyBlockSize(); if (! empty($keyBlockSizes)) { $sql_query .= sprintf( - ' KEY_BLOCK_SIZE = ', + ' KEY_BLOCK_SIZE = %s', $GLOBALS['dbi']->escapeString($keyBlockSizes) ); } From 07e4d7638ebac6cf33f949fa9d907dfcf6d150f6 Mon Sep 17 00:00:00 2001 From: Technoknol Date: Mon, 20 May 2019 17:23:03 +0530 Subject: [PATCH 2/3] Fix #15262 Incorrect display of charset column : --- templates/database/structure/structure_table_row.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/database/structure/structure_table_row.twig b/templates/database/structure/structure_table_row.twig index c1177c9ef9..0926eb70b9 100644 --- a/templates/database/structure/structure_table_row.twig +++ b/templates/database/structure/structure_table_row.twig @@ -120,7 +120,7 @@ {% if not (show_charset > 1) %} {% if charset|length > 0 %} - {{ charset }} + {{ charset|raw }} {% endif %} {% endif %} From 3002944e2474151491ea47765254bb19d4aaee38 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Mon, 20 May 2019 14:20:05 +0200 Subject: [PATCH 3/3] Add ChangeLog entry for #15262 - Removed a white space Signed-off-by: William Desportes --- ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 83f77ac2fc..90401f4489 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,7 +103,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