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

Revert fix for #1353437, there are wrong data and not displaying of it, fix bad display of table privileges.

Browse Source
This commit is contained in:
Michal Čihař
2005-11-10 21:41:01 +00:00
parent 7868520c9f
commit 9df1de79bc
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -13,6 +13,8 @@ $Source$
2005-11-10 Michal Čihař <michal@cihar.com> 2005-11-10 Michal Čihař <michal@cihar.com>
* scripts/create-release.sh: = is correct for comparsion in shell. * scripts/create-release.sh: = is correct for comparsion in shell.
* server_privileges.php: Revert fix for #1353437, there are wrong data and
not displaying of it, fix bad display of table privileges.
2005-11-09 Marc Delisle <lem9@users.sourceforge.net> 2005-11-09 Marc Delisle <lem9@users.sourceforge.net>
* pdf_pages.php: bug #1245891, too large scaling in PDF schema * pdf_pages.php: bug #1245891, too large scaling in PDF schema

6
server_privileges.php
View File

@@ -1665,7 +1665,7 @@ if ( empty( $adduser ) && empty( $checkprivs ) ) {
.' AND ' . PMA_convert_using('`Db`') .' AND ' . PMA_convert_using('`Db`')
.' LIKE ' . PMA_convert_using($dbname, 'quoted') .' LIKE ' . PMA_convert_using($dbname, 'quoted')
.' ORDER BY `Table_name` ASC;'; .' ORDER BY `Table_name` ASC;';
$db_rights = PMA_DBI_fetch_result( $sql_query, 'Db', NULL, NULL, PMA_DBI_QUERY_STORE ); $db_rights = PMA_DBI_fetch_result($sql_query);
} }
@@ -1688,7 +1688,7 @@ if ( empty( $adduser ) && empty( $checkprivs ) ) {
. ' </tt></td>' . "\n" . ' </tt></td>' . "\n"
. ' <td>' . (((empty($dbname) && $row['Grant_priv'] == 'Y') || (!empty($dbname) && in_array('Grant', explode(',', $row['Table_priv'])))) ? $GLOBALS['strYes'] : $GLOBALS['strNo']) . '</td>' . "\n" . ' <td>' . (((empty($dbname) && $row['Grant_priv'] == 'Y') || (!empty($dbname) && in_array('Grant', explode(',', $row['Table_priv'])))) ? $GLOBALS['strYes'] : $GLOBALS['strNo']) . '</td>' . "\n"
. ' <td>'; . ' <td>';
if ((isset($row['Table_priv']) && $row['Table_priv']) || (isset($row['Column_priv']) && $row['Column_priv'])) { if ($row['Table_priv'] || $row['Column_priv']) {
echo $GLOBALS['strYes']; echo $GLOBALS['strYes'];
} else { } else {
echo $GLOBALS['strNo']; echo $GLOBALS['strNo'];
@@ -1701,7 +1701,7 @@ if ( empty( $adduser ) && empty( $checkprivs ) ) {
urlencode( empty($dbname) ? '' : $row['Table_name'] ) ); urlencode( empty($dbname) ? '' : $row['Table_name'] ) );
echo '</td>' . "\n" echo '</td>' . "\n"
. ' <td>'; . ' <td>';
if ( (isset($row['can_delete']) && $row['can_delete']) || (isset($row['Table_name']) && $row['Table_name'])) { if ($row['can_delete'] || $row['Table_name']) {
printf( $link_revoke, urlencode( $username ), printf( $link_revoke, urlencode( $username ),
urlencode( $hostname ), urlencode( $hostname ),
urlencode( empty( $dbname ) ? $row['Db'] : $dbname ), urlencode( empty( $dbname ) ? $row['Db'] : $dbname ),