From ea50288fcad8a99d6cf67eb1ff9ccd7f622df486 Mon Sep 17 00:00:00 2001
From: "Ann + J.M" <phpMyAdmin@ZweiSteinSoft.de>
Date: Sat, 29 Mar 2014 21:34:08 +0100
Subject: [PATCH] Fix #4345 Privileges editor shows databases with underscore
 backslash-escaped

Signed-off-by: Ann + J.M <phpMyAdmin@ZweiSteinSoft.de>
---
 libraries/server_privileges.lib.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index aa72a282fc..a0eaae9092 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -2485,7 +2485,7 @@ function PMA_getLinkToDbAndTable($url_dbname, $dbname, $tablename)
             )
         )
         . '">'
-        . htmlspecialchars($dbname) . ': '
+        . htmlspecialchars(stripslashes($dbname)) . ': '
         . PMA_Util::getTitleForTarget(
             $GLOBALS['cfg']['DefaultTabDatabase']
         )
@@ -2640,7 +2640,7 @@ function PMA_getHtmlForDisplayUserRightsInRows($db_rights, $dbname,
             $html_output .= '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n"
                 . '<td>'
                 . htmlspecialchars(
-                    (! strlen($dbname)) ? $row['Db'] : $row['Table_name']
+                    (! strlen($dbname)) ? stripslashes($row['Db']) : $row['Table_name']
                 )
                 . '</td>' . "\n"
                 . '<td><code>' . "\n"
@@ -2742,7 +2742,7 @@ function PMA_getTableForDisplayAllTableSpecificRights(
     // table body
     // get data
 
-    // we also want privielgs for this user not in table `db` but in other table
+    // we also want privileges for this user not in table `db` but in other table
     $tables = $GLOBALS['dbi']->fetchResult('SHOW TABLES FROM `mysql`;');
 
     /**
@@ -3726,13 +3726,14 @@ function PMA_getHtmlHeaderForDisplayUserProperties(
                         'tablename' => '',
                     )
                 )
-                . '">' . htmlspecialchars($dbname)
+                . '">' . htmlspecialchars(stripslashes($dbname))
                 . '</a></i>';
 
             $html_output .= ' - ' . __('Table')
                 . ' <i>' . htmlspecialchars($tablename) . '</i>';
         } else {
-            $html_output .= ' <i>' . htmlspecialchars($dbname) . '</i>';
+            $html_output .= ' <i>' . htmlspecialchars(stripslashes($dbname))
+                . '</i>';
         }
 
     } else {