From c274f193a1e9d27899e938995fe5f169f024aece Mon Sep 17 00:00:00 2001 From: Pavel Rochnyack Date: Sun, 14 Aug 2016 18:14:34 +0100 Subject: [PATCH] Revert "fixed checking of user rights to make it look for database privileges" This reverts commit df137f2410c004a7dcb6ca15306018060cba76e0. Signed-off-by: Pavel Rochnyack --- libraries/insert_edit.lib.php | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index d59233fabc..cb8bd09244 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -2938,8 +2938,8 @@ function PMA_getHtmlForInsertEditRow($url_params, $table_columns, } for ($column_number = 0; $column_number < $columns_cnt; $column_number++) { $table_column = $table_columns[$column_number]; - // skip this column if user does not have necessary database or column privileges - if (! PMA_userHasDatabasePrivileges($db, $insert_mode) && ! PMA_userHasColumnPrivileges($table_column, $insert_mode)) { + // skip this column if user does not have necessary column privilges + if (! PMA_userHasColumnPrivileges($table_column, $insert_mode)) { continue; } $column_mime = array(); @@ -2979,17 +2979,3 @@ function PMA_userHasColumnPrivileges($table_column, $insert_mode) return ($insert_mode && strstr($privileges, 'insert') !== false) || (! $insert_mode && strstr($privileges, 'update') !== false); } - -/** - * Returns whether the user has necessary insert/update privileges for the database - * - * @param string $database database name - * @param bool $insert_mode whether on insert mode - * - * @return boolean whether user has necessary privileges - */ -function PMA_userHasDatabasePrivileges($database, $insert_mode) -{ - return ($insert_mode && PMA\libraries\Util::currentUserHasPrivilege('INSERT', $database) !== false) - || (! $insert_mode && PMA\libraries\Util::currentUserHasPrivilege('UPDATE', $database) !== false); -}