diff options
| author | Madhura Jayaratne <madhura.cj@gmail.com> | 2017-08-29 16:27:22 +0300 |
|---|---|---|
| committer | Madhura Jayaratne <madhura.cj@gmail.com> | 2017-08-29 16:27:22 +0300 |
| commit | 047de9cdf4990ad6ac5833938ea8acf438c6b385 (patch) | |
| tree | 51045dbe14d623301a148c7d8085fc58fe3eef49 /js/makegrid.js | |
| parent | f4d77f905df82746052a9e749e4aa040bb202d4f (diff) | |
| parent | d84ed95285618b33e92dd952e81c5893c6faa849 (diff) | |
Merge branch 'QA_4_7' of github.com:phpmyadmin/phpmyadmin into QA_4_7
Diffstat (limited to 'js/makegrid.js')
| -rw-r--r-- | js/makegrid.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/makegrid.js b/js/makegrid.js index 620a81b4ba..65e605352c 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -1445,7 +1445,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi // selection list will always be updated to the edit box this_field_params[field_name] = $(g.cEdit).find('.edit_box').val(); } else if ($this_field.hasClass('hex')) { - if ($(g.cEdit).find('.edit_box').val().match(/^[a-f0-9]*$/i) !== null) { + if ($(g.cEdit).find('.edit_box').val().match(/^(0x)?[a-f0-9]*$/i) !== null) { this_field_params[field_name] = $(g.cEdit).find('.edit_box').val(); } else { var hexError = '<div class="error">' + PMA_messages.strEnterValidHex + '</div>'; |