Merge #19039 - Fix #19037 - Link to privilege on table or db without …

…an existing grant Pull-request: #19039 Fixes #19037 Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · Apr 27, 2024 · 67c42ee · 67c42ee
2 parents de9a89e + 182f4eb
commit 67c42ee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/templates/database/privileges/index.twig b/templates/database/privileges/index.twig
@@ -73,7 +73,7 @@
                         <a class="edit_user_anchor" href="{{ url('/server/privileges', {
                           'username': privilege.user,
                           'hostname': privilege.host,
-                          'dbname': priv.database != '*' ? priv.database,
+                          'dbname': priv.database != '*' ? priv.database : db,
                           'tablename': '',
                           'routinename': priv.routine ?? ''
                         }) }}">

diff --git a/templates/table/privileges/index.twig b/templates/table/privileges/index.twig
@@ -77,8 +77,8 @@
                       <a class="edit_user_anchor" href="{{ url('/server/privileges', {
                         'username': privilege.user,
                         'hostname': privilege.host,
-                        'dbname': priv.database != '*' ? priv.database,
-                        'tablename': priv.table is defined and priv.table != '*' ? priv.table,
+                        'dbname': priv.database != '*' ? priv.database : db,
+                        'tablename': priv.table is defined and priv.table != '*' ? priv.table : table,
                         'routinename': priv.routine ?? ''
                       }) }}">
                         {{ get_icon('b_usredit', 'Edit privileges'|trans) }}