From 7367753d0c0f894a4a370a7a4e9af9f34b174d77 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 11 Aug 2019 22:43:53 +0200
Subject: [PATCH 1/3] [structure] Remove html escaping in insert col after col
 <select>

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 templates/table/structure/add_column.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/table/structure/add_column.twig b/templates/table/structure/add_column.twig
index 9c88c0a2d2..1d53cc9644 100644
--- a/templates/table/structure/add_column.twig
+++ b/templates/table/structure/add_column.twig
@@ -16,7 +16,7 @@
         {% for one_column_name in columns_list %}
             <option value="{{ one_column_name }}"
                 {{- loop.revindex0 == 0 ? ' selected="selected"' }}>
-                {{ 'after %s'|trans|format(one_column_name|e) }}
+                {{ 'after %s'|trans|format(one_column_name) }}
             </option>
         {% endfor %}
     </select>

From 2eaf9a516b5cd5768d3f4826ef24251f9eb53723 Mon Sep 17 00:00:00 2001
From: Rahul Gurung <gurungrahul2@gmail.com>
Date: Tue, 13 Aug 2019 11:35:51 +0530
Subject: [PATCH 2/3] fixed whitesquare in floating menubar

Signed-off-by: Rahul Gurung <gurungrahul2@gmail.com>
---
 js/navigation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/navigation.js b/js/navigation.js
index 494b7d0a04..3f6ad7c9f1 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -1128,7 +1128,7 @@ var ResizeHandler = function () {
         var windowWidth = $(window).width();
         $('#pma_navigation').width(pos);
         $('body').css('margin-' + this.left, pos + 'px');
-        $('#floating_menubar, #pma_console')
+        $('#pma_console')
             .css('margin-' + this.left, (pos + resizer_width) + 'px');
         $resizer.css(this.left, pos + 'px');
         if (pos === 0) {

From 61ea8b799a68bb30c61811e4205da4cb5d6a158f Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 15 Aug 2019 19:08:48 +0200
Subject: [PATCH 3/3] Add ChangeLog entry for #15127

[ci skip]
Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 9ffb75fd5f..23c4aa0f33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog
 - issue        Added description for the _nopad (NO PAD) collation suffix
 - issue #15404 Remove array/string curly braces access
 - issue #15427 Fixed "FilterLanguages" option does not work (configuration)
+- issue #15127 Fix remove the white square in floating menubar when reloading the designer
 
 4.9.0.1 (2019-06-04)
 - issue #14478 phpMyAdmin no longer streams the export data