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

Fixed editing of rows with text primary key

Browse Source 
We do htmlspecialchars in PHP, so we should not URL de/encode here.

Fixes #13088

Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2017-03-16 15:12:38 +01:00
parent 0f862dfab1
commit 91a16c90c8
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -102,6 +102,7 @@ phpMyAdmin - ChangeLog
- issue #12708 Removed phpMyAdmin version from User-Agent header
- issue #13084 Do not point users to setup when it is disabled
- issue #12660 Delete only phpMyAdmin cookies on upgrade
- issue #13088 Fixed editing of rows with text primary key
4.6.6 (2017-01-23)
- issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'

23
js/makegrid.js
View File

@ -946,7 +946,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
// if the data is truncated, get the full data
if ($td.is('.truncated')) {
post_params.get_full_values = true;
post_params.where_clause = PMA_urldecode(where_clause);
post_params.where_clause = where_clause;
}
g.lastXHR = $.post('sql.php', post_params, function (data) {
@ -986,7 +986,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
/**
* @var sql_query String containing the SQL query used to retrieve value of truncated/transformed data
*/
var sql_query = 'SELECT `' + field_name + '` FROM `' + g.table + '` WHERE ' + PMA_urldecode(where_clause);
var sql_query = 'SELECT `' + field_name + '` FROM `' + g.table + '` WHERE ' + where_clause;
// Make the Ajax call and get the data, wrap it and insert it
g.lastXHR = $.post('sql.php', {
@ -1162,7 +1162,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
if (typeof where_clause === 'undefined') {
where_clause = '';
}
full_where_clause.push(PMA_urldecode(where_clause));
full_where_clause.push(where_clause);
var condition_array = JSON.parse($tr.find('.condition_array').val());
/**
@ -1250,7 +1250,6 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
new_clause += field + ' ' + condition_array[field] + ' AND ';
}
new_clause = new_clause.substring(0, new_clause.length - 5); // remove the last AND
new_clause = PMA_urlencode(new_clause);
$tr.data('new_clause', new_clause);
// save condition_array
$tr.find('.condition_array').val(JSON.stringify(condition_array));
@ -1321,8 +1320,8 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
var new_clause = $(this).data('new_clause');
var $where_clause = $(this).find('.where_clause');
var old_clause = $where_clause.val();
var decoded_old_clause = PMA_urldecode(old_clause);
var decoded_new_clause = PMA_urldecode(new_clause);
var decoded_old_clause = old_clause;
var decoded_new_clause = new_clause;
$where_clause.val(new_clause);
// update Edit, Copy, and Delete links also
@ -1770,14 +1769,13 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
if (typeof where_clause === 'undefined') {
where_clause = '';
}
where_clause = PMA_urldecode(where_clause);
var found = false;
var $found_row;
var $prev_row;
var j = 0;
$this_field.parents('tr').first().parents('tbody').children().each(function(){
if (PMA_urldecode($(this).find('.where_clause').val()) == where_clause) {
if ($(this).find('.where_clause').val() == where_clause) {
found = true;
$found_row = $(this);
}
@ -1814,14 +1812,13 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
if (typeof where_clause === 'undefined') {
where_clause = '';
}
where_clause = PMA_urldecode(where_clause);
var found = false;
var $found_row;
var $next_row;
var j = 0;
var next_row_found = false;
$this_field.parents('tr').first().parents('tbody').children().each(function(){
if (PMA_urldecode($(this).find('.where_clause').val()) == where_clause) {
if ($(this).find('.where_clause').val() == where_clause) {
found = true;
$found_row = $(this);
}
@ -1862,12 +1859,11 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
if (typeof where_clause === 'undefined') {
where_clause = '';
}
where_clause = PMA_urldecode(where_clause);
var found = false;
var $found_row;
var j = 0;
$this_field.parents('tr').first().parents('tbody').children().each(function(){
if (PMA_urldecode($(this).find('.where_clause').val()) == where_clause) {
if ($(this).find('.where_clause').val() == where_clause) {
found = true;
$found_row = $(this);
}
@ -1904,12 +1900,11 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
if (typeof where_clause === 'undefined') {
where_clause = '';
}
where_clause = PMA_urldecode(where_clause);
var found = false;
var $found_row;
var j = 0;
$this_field.parents('tr').first().parents('tbody').children().each(function(){
if (PMA_urldecode($(this).find('.where_clause').val()) == where_clause) {
if ($(this).find('.where_clause').val() == where_clause) {
found = true;
$found_row = $(this);
}