From d70d9ecef18a7b473b594dff326990091a0dcb29 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 2 May 2019 12:07:50 +0200
Subject: [PATCH 1/2] Fix #15238 - phpMyAdmin 4.8.5 doesn't show privileges of
 procedures

Fixes: #15238
Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 templates/privileges/edit_routine_privileges.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/privileges/edit_routine_privileges.twig b/templates/privileges/edit_routine_privileges.twig
index 461edbdc09..be3c0b18ea 100644
--- a/templates/privileges/edit_routine_privileges.twig
+++ b/templates/privileges/edit_routine_privileges.twig
@@ -1,5 +1,5 @@
 <div id="edit_user_dialog">
-    {{ header }}
+    {{ header|raw }}
     <form class="submenu-item" name="usersForm" id="addUsersForm" action="server_privileges.php" method="post">
         {{ Url_getHiddenInputs() }}
         <input type="hidden" name="username" value="{{ username }}">
@@ -16,7 +16,7 @@
                     <em>{% trans 'Note: MySQL privilege names are expressed in English.' %}</em>
                 </small>
             </p>
-            {{ priv_checkboxes }}
+            {{ priv_checkboxes|raw }}
         </fieldset>
         <fieldset id="fieldset_user_privtable_footer" class="tblFooters">
             <input type="hidden" name="update_privs" value="1">

From d6180da08c6f1bc342bba311e596a3ecfd9d4f8d Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Thu, 2 May 2019 12:09:33 +0200
Subject: [PATCH 2/2] Add ChangeLog entry for #15238

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

diff --git a/ChangeLog b/ChangeLog
index 988c72c3db..d7812ddf1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -87,6 +87,7 @@ phpMyAdmin - ChangeLog
 - issue #12865 Fixed MySQL 8.0.0 issues with GIS display
 - issue #15059 Fixed "Server charset" in "Database server" tab showing wrong information
 - issue #14614 Fixed mysql error "#2014 - Commands out of sync; you can't run this command now" on sql query
+- issue #15238 Fixed phpMyAdmin 4.8.5 doesn't show privileges of procedures (raw html displayed instead)
 
 4.8.5 (2019-01-25)
 - issue        Developer debug data was saved to the PHP error log