From 8d862a8cb5c9b8dc37ae1aea10205eec35e68ae8 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 1 May 2011 06:50:37 -0400 Subject: [PATCH 1/2] Bug #3294818 Fatal error in server_privileges.php (bot access) --- server_privileges.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server_privileges.php b/server_privileges.php index 308739cf1..a9ebcd96b 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1451,7 +1451,9 @@ if( $GLOBALS['is_ajax_request'] && !isset($_REQUEST['export']) && (!isset($_REQU $extra_data['new_privileges'] = $new_privileges; } - PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); + if ($message instanceof PMA_Message) { + PMA_ajaxResponse($message, $message->isSuccess(), $extra_data); + } } /** From d1c6fcc4b687147024fe78df256a02713507519d Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 1 May 2011 07:27:04 -0400 Subject: [PATCH 2/2] Misleading comments --- tbl_row_action.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tbl_row_action.php b/tbl_row_action.php index cce3f7b38..b2f28fa4f 100644 --- a/tbl_row_action.php +++ b/tbl_row_action.php @@ -72,7 +72,7 @@ switch($submit_mult) { if (!empty($submit_mult)) { switch($submit_mult) { case 'row_edit': - // As we got the fields to be edited from the + // As we got the rows to be edited from the // 'rows_to_delete' checkbox, we use the index of it as the // indicating WHERE clause. Then we build the array which is used // for the tbl_change.php script. @@ -89,7 +89,7 @@ if (!empty($submit_mult)) { // Needed to allow SQL export $single_table = TRUE; - // As we got the fields to be edited from the + // As we got the rows to be exported from the // 'rows_to_delete' checkbox, we use the index of it as the // indicating WHERE clause. Then we build the array which is used // for the tbl_change.php script.