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

Fix merge conflict

Browse Source 
Signed-off-by: Marc Delisle <marc@infomarc.info>
This commit is contained in:
Marc Delisle 2014-08-29 09:13:41 -04:00
commit 6cd19738cd
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -47,6 +47,7 @@ phpMyAdmin - ChangeLog
- bug #4518 Export to SQL: CREATE TABLE option AUTO_INCREMENT ignored
- bug #4522 Duplicate column names while assigning index
- bug #4487 Export of partitioned table does not import
- bug server_privileges.js: cannot read property
4.2.7.1 (2014-08-17)
- bug #4501 [security] XSS in table browse page

19
js/server_privileges.js
View File

@ -57,14 +57,17 @@ function appendNewUser(new_user_string, new_user_initial, new_user_initial_strin
if ($curr_last_row.length) {
// at least one tr exists inside the tbody
var $curr_first_row = $("#usersForm").find('tbody').find('tr:first');
var first_row_initial = $curr_first_row.find('label').html().substr(0, 1).toUpperCase();
curr_shown_initial = $curr_last_row.find('label').html().substr(0, 1).toUpperCase();
var curr_last_row_index_string = $curr_last_row.find('input:checkbox').attr('id').match(/\d+/)[0];
var curr_last_row_index = parseFloat(curr_last_row_index_string);
new_last_row_index = curr_last_row_index + 1;
is_show_all = (first_row_initial != curr_shown_initial) ? true : false;
$insert_position = $curr_last_row;
dummy_tr_inserted = false;
var $first_row_label = $curr_first_row.find('label');
if ($first_row_label.length) {
var first_row_initial = $first_row_label.html().substr(0, 1).toUpperCase();
curr_shown_initial = $curr_last_row.find('label').html().substr(0, 1).toUpperCase();
var curr_last_row_index_string = $curr_last_row.find('input:checkbox').attr('id').match(/\d+/)[0];
var curr_last_row_index = parseFloat(curr_last_row_index_string);
new_last_row_index = curr_last_row_index + 1;
is_show_all = (first_row_initial != curr_shown_initial) ? true : false;
$insert_position = $curr_last_row;
dummy_tr_inserted = false;
}
} else {
// no tr exists inside the tbody
$tbody = $("#usersForm").find('tbody');