gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #12419 wrong description on GRANT option of table/routine privileges.

Browse Source 
Signed-off-by: Pavel Rochnyack <pavel2000@ngs.ru>
This commit is contained in:
Pavel Rochnyack 2016-08-03 11:11:02 +01:00
parent d09e5438c1
commit d1e353f235
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libraries/server_privileges.lib.php
View File

@ -1032,8 +1032,8 @@ function PMA_getTriggerPrivilegeTable()
'Grant',
'GRANT',
__(
'Allows adding users and privileges '
. 'without reloading the privilege tables.'
'Allows user to give to other users or remove from other users '
. 'privileges that user possess on this routine.'
)
),
array(
@ -1402,16 +1402,16 @@ function PMA_getStructurePrivilegeTable($table, $row)
*/
function PMA_getAdministrationPrivilegeTable($db)
{
$adminPrivTable = array(
array('Grant',
'GRANT',
__(
'Allows adding users and privileges '
. 'without reloading the privilege tables.'
)
),
);
if ($db == '*') {
$adminPrivTable = array(
array('Grant',
'GRANT',
__(
'Allows adding users and privileges '
. 'without reloading the privilege tables.'
)
),
);
$adminPrivTable[] = array('Super',
'SUPER',
__(
@ -1438,6 +1438,17 @@ function PMA_getAdministrationPrivilegeTable($db)
__('Gives access to the complete list of databases.')
);
}
else {
$adminPrivTable = array(
array('Grant',
'GRANT',
__(
'Allows user to give to other users or remove from other'
. ' users the privileges that user possess yourself.'
)
),
);
}
$adminPrivTable[] = array('Lock_tables',
'LOCK TABLES',
__('Allows locking tables for the current thread.')

5
server_privileges.php
View File

@ -68,8 +68,9 @@ $strPrivDescDropTbl = __('Allows dropping tables.');
$strPrivDescEvent = __('Allows to set up events for the event scheduler.');
$strPrivDescExecute = __('Allows executing stored routines.');
$strPrivDescFile = __('Allows importing data from and exporting data into files.');
$strPrivDescGrant = __(
'Allows adding users and privileges without reloading the privilege tables.'
$strPrivDescGrantTbl = __(
'Allows user to give to other users or remove from other users the privileges '
. 'that user possess yourself.'
);
$strPrivDescIndex = __('Allows creating and dropping indexes.');
$strPrivDescInsert = __('Allows inserting and replacing data.');