diff --git a/libraries/insert_edit.lib.php b/libraries/insert_edit.lib.php index 8d62bb9a8b..73f86c604d 100644 --- a/libraries/insert_edit.lib.php +++ b/libraries/insert_edit.lib.php @@ -2009,7 +2009,7 @@ function PMA_getQueryValuesForInsertAndUpdateInMultipleEdit($multi_edit_columns_ $multi_edit_columns_null, $current_value, $multi_edit_columns_prev, $multi_edit_funcs,$is_insert, $query_values, $query_fields, $current_value_as_an_array, $value_sets, $key, $multi_edit_columns_null_prev -) { +) { // i n s e r t if ($is_insert) { // no need to add column into the valuelist diff --git a/tbl_replace.php b/tbl_replace.php index b9b4711afc..7fbcdbae8a 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -250,7 +250,8 @@ if (! empty($error_messages)) { } unset($error_messages, $warning_messages, $total_affected_rows, $last_messages, $last_message); -if ($GLOBALS['is_ajax_request'] == true) { +$response = PMA_Response::getInstance(); +if ($response->isAjax()) { /** * If we are in grid editing, we need to process the relational and * transformed fields, if they were edited. After that, output the correct @@ -270,11 +271,13 @@ if ($GLOBALS['is_ajax_request'] == true) { foreach ( $relation_fields as $cell_index => $curr_cell_rel_field) { foreach ( $curr_cell_rel_field as $relation_field => $relation_field_value) { $where_comparison = "='" . $relation_field_value . "'"; - $dispval = PMA_getDisplayValueForForeignTableColumn($where_comparison, $relation_field_value, $map, $relation_field); + $dispval = PMA_getDisplayValueForForeignTableColumn( + $where_comparison, $relation_field_value, $map, $relation_field + ); $extra_data['relations'][$cell_index] = PMA_getLinkForRelationalDisplayField( $map, $relation_field, $where_comparison, $dispval, $relation_field_value - ); + ); } } // end of loop for each relation cell } @@ -303,7 +306,6 @@ if ($GLOBALS['is_ajax_request'] == true) { $extra_data['row_count'] = PMA_Table::countRecords($_REQUEST['db'], $_REQUEST['table']); $extra_data['sql_query'] = PMA_getMessage($message, $GLOBALS['display_query']); - $response = PMA_Response::getInstance(); $response->isSuccess($message->isSuccess()); $response->addJSON('message', $message); $response->addJSON($extra_data);