From d652d31a5dac804fccb7e03da0dfc4df3680ce97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 28 Aug 2017 15:46:44 +0200
Subject: [PATCH] Add privileges export to per database listing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #13576

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog                               |  1 +
 libraries/classes/Server/Privileges.php | 21 ++++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 191e895243..eb3768d2b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,7 @@ phpMyAdmin - ChangeLog
 - issue #13408 Show MySQL warnings when executing SQL queries
 - issue #5827  Allow Designer to show tables from other databases
 - issue #13268 Replace Query-By-Example with multi-table query generator interface
+- issue #13576 Add privileges export to per database listing
 
 4.7.5 (not yet released)
 - issue #13615 Avoid problems with browsing unknown query types
diff --git a/libraries/classes/Server/Privileges.php b/libraries/classes/Server/Privileges.php
index 7b4a8137d8..73bae68f06 100644
--- a/libraries/classes/Server/Privileges.php
+++ b/libraries/classes/Server/Privileges.php
@@ -2323,6 +2323,16 @@ class Privileges
                 );
             }
             $html_output .= '</td>';
+            $html_output .= '<td>';
+            $html_output .= self::getUserLink(
+                'export',
+                $current_user,
+                $current_host,
+                $specific_db,
+                $specific_table,
+                $routine
+            );
+            $html_output .= '</td>';
 
             $html_output .= '</tr>';
 
@@ -2548,7 +2558,7 @@ class Privileges
             . '<th>' . __('Type') . '</th>'
             . '<th>' . __('Privileges') . '</th>'
             . '<th>' . __('Grant') . '</th>'
-            . '<th>' . __('Action') . '</th>'
+            . '<th colspan="2">' . __('Action') . '</th>'
             . '</tr>'
             . '</thead>';
     }
@@ -2741,6 +2751,15 @@ class Privileges
                 );
             }
             $html_output .= '</td>';
+            $html_output .= '<td class="center">'
+                . self::getUserLink(
+                    'export',
+                    $current_user,
+                    $current_host,
+                    $specific_db,
+                    $specific_table
+                )
+                . '</td>';
 
             $html_output .= '</tr>';
             if (($i + 1) < $nbPrivileges) {