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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server
2011-05-01 14:40:08 +02:00
parent 2cc56dff42 d1c6fcc4b6
commit f73eca8e83
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server_privileges.php
View File

@@ -1451,7 +1451,9 @@ if( $GLOBALS['is_ajax_request'] && !isset($_REQUEST['export']) && (!isset($_REQU
$extra_data['new_privileges'] = $new_privileges; $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);
}
} }
/** /**

4
tbl_row_action.php
View File

@@ -72,7 +72,7 @@ switch($submit_mult) {
if (!empty($submit_mult)) { if (!empty($submit_mult)) {
switch($submit_mult) { switch($submit_mult) {
case 'row_edit': 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 // 'rows_to_delete' checkbox, we use the index of it as the
// indicating WHERE clause. Then we build the array which is used // indicating WHERE clause. Then we build the array which is used
// for the tbl_change.php script. // for the tbl_change.php script.
@@ -89,7 +89,7 @@ if (!empty($submit_mult)) {
// Needed to allow SQL export // Needed to allow SQL export
$single_table = TRUE; $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 // 'rows_to_delete' checkbox, we use the index of it as the
// indicating WHERE clause. Then we build the array which is used // indicating WHERE clause. Then we build the array which is used
// for the tbl_change.php script. // for the tbl_change.php script.