diff options
| author | Michal Čihař <michal@cihar.com> | 2005-11-11 00:41:01 +0300 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2005-11-11 00:41:01 +0300 |
| commit | 9df1de79bc29f687767c018827f9d7ba0c7ec0f5 (patch) | |
| tree | f5c4ff72cdaa174d8064a7a95351d947e95500ec /server_privileges.php | |
| parent | 7868520c9ffc66561157a3a520831eaac95c1a6f (diff) | |
Revert fix for #1353437, there are wrong data and not displaying of it, fix bad display of table privileges.
Diffstat (limited to 'server_privileges.php')
| -rw-r--r-- | server_privileges.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/server_privileges.php b/server_privileges.php index 88e82bc571..76b9ae716a 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1665,7 +1665,7 @@ if ( empty( $adduser ) && empty( $checkprivs ) ) { .' AND ' . PMA_convert_using('`Db`') .' LIKE ' . PMA_convert_using($dbname, 'quoted') .' 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" . ' <td>' . (((empty($dbname) && $row['Grant_priv'] == 'Y') || (!empty($dbname) && in_array('Grant', explode(',', $row['Table_priv'])))) ? $GLOBALS['strYes'] : $GLOBALS['strNo']) . '</td>' . "\n" . ' <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']; } else { echo $GLOBALS['strNo']; @@ -1701,7 +1701,7 @@ if ( empty( $adduser ) && empty( $checkprivs ) ) { urlencode( empty($dbname) ? '' : $row['Table_name'] ) ); echo '</td>' . "\n" . ' <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 ), urlencode( $hostname ), urlencode( empty( $dbname ) ? $row['Db'] : $dbname ), |