Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5

This commit is contained in:
Michal Čihař 2012-07-28 15:46:21 +02:00
commit 6c5a412a64
2 changed files with 2 additions and 1 deletions

View File

@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog
- bug #3544366 [interface] Event comments not saved
- bug #3549084 [edit] Can't enter date directly when editing inline
- bug #3548491 [interface] Inline query editor doesn't work from search results
- bug #3547825 [edit] BLOB download no longer works
3.5.2.0 (2012-07-07)
- bug #3521416 [interface] JS error when editing index

View File

@ -1588,7 +1588,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
e.stopPropagation();
}
// prevent default action when clicking on "link" in a table
if ($(e.target).is('a')) {
if ($(e.target).is('.grid_edit a')) {
e.preventDefault();
}
});