Merge branch 'QA_4_8'

Signed-off-by: William Desportes <williamdes@wdes.fr>

ChangeLog

@@ -119,6 +119,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

templates/server/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">
         {{ get_hidden_inputs() }}
         <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">