From 94e23189bdf4fcf5fd525e0172fdcbf886e1f0c8 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 23 Feb 2020 13:54:43 +0100
Subject: [PATCH 1/5] Add missing css class on "show report details" button

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 js/error_report.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/error_report.js b/js/error_report.js
index 6f293386f0..c9e9ccbbaa 100644
--- a/js/error_report.js
+++ b/js/error_report.js
@@ -132,7 +132,7 @@ var ErrorReport = {
 
         var $buttons = $('<div class="floatright"></div>');
 
-        var buttonHtml  = '<button id="show_error_report">';
+        var buttonHtml  = '<button class="btn btn-primary" id="show_error_report">';
         buttonHtml += Messages.strShowReportDetails;
         buttonHtml += '</button>';
 

From d95e8ca4a1827b78f6318679ddc31fbf54b24393 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 23 Feb 2020 14:00:10 +0100
Subject: [PATCH 2/5] Fix PHP Fatal error:  Uncaught TypeError:
 htmlspecialchars() expects parameter 1 to be string, int given

Uncaught TypeError: htmlspecialchars() expects parameter 1 to be string, int given in libraries/classes/Server/Privileges.php:2777

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 libraries/classes/Server/Privileges.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php
index fddfe42156..46d3afab24 100644
--- a/libraries/classes/Server/Privileges.php
+++ b/libraries/classes/Server/Privileges.php
@@ -2774,7 +2774,7 @@ class Privileges
                     $html_output .= '<span style="color: #FF0000">'
                         . __('Any') . '</span>';
                 } else {
-                    $html_output .= htmlspecialchars($current_user);
+                    $html_output .= htmlspecialchars((string) $current_user);
                 }
                 $html_output .= '</td>';
 

From e8a3f6a6bb1ef5594f1452d7cfe126079904d701 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 23 Feb 2020 14:01:53 +0100
Subject: [PATCH 3/5] Add ChangeLog entry for d95e8ca4a1

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

diff --git a/ChangeLog b/ChangeLog
index 82b2c2a748..102c27a80f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,6 +55,7 @@ phpMyAdmin - ChangeLog
 - issue        Fix maxlength for User and Host on replication add user form
 - issue #15282 Fixed MySQL 8.0 password syntax error when creating a replication user
 - issue #15986 Fixed php fatal error "Uncaught TypeError: array_flip() expects parameter 1 to be array, null given"
+- issue        Fixed php fatal error "Uncaught TypeError: htmlspecialchars() expects parameter 1 to be string, int given"
 
 5.0.1 (2020-01-07)
 - issue #15719 Fixed error 500 when browsing a table when $cfg['LimitChars'] used a string and not an int value

From 9a9cf3c6c6208dda94ba76af368fd62b0d8c5de2 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 23 Feb 2020 14:07:02 +0100
Subject: [PATCH 4/5] Add missing css class on "print" and "back" buttons

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 js/functions.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/js/functions.js b/js/functions.js
index 4ae22420a7..289dedc16d 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -4486,6 +4486,7 @@ Functions.createPrintAndBackButtons = function () {
     var backButton = $('<input>',{
         type: 'button',
         value: Messages.back,
+        class: 'btn btn-primary',
         id: 'back_button_print_view'
     });
     backButton.on('click', Functions.removePrintAndBackButton);
@@ -4493,6 +4494,7 @@ Functions.createPrintAndBackButtons = function () {
     var printButton = $('<input>',{
         type: 'button',
         value: Messages.print,
+        class: 'btn btn-primary',
         id: 'print_button_print_view'
     });
     printButton.on('click', Functions.printPage);

From c7fbd0143395ec8523647acc2d7d3dccbdfb4c39 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Sun, 23 Feb 2020 14:09:58 +0100
Subject: [PATCH 5/5] Add missing css class on "edit view" button

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

diff --git a/templates/view_create.twig b/templates/view_create.twig
index 857762f73d..0d754a37ef 100644
--- a/templates/view_create.twig
+++ b/templates/view_create.twig
@@ -113,7 +113,7 @@
 
     {% if ajax_dialog == false %}
         <input type="hidden" name="ajax_dialog" value="1" />
-        <input type="submit" name="" value="{% trans 'Go' %}" />
+        <input type="submit" class="btn btn-primary" name="" value="{% trans 'Go' %}" />
     {% endif %}
 
     </form>