Merge remote branch 'upstream/master'

This commit is contained in:
Chanaka Indrajith 2012-07-02 22:54:18 +05:30
commit e6d7ada958
2 changed files with 7 additions and 4 deletions

View File

@ -48,6 +48,7 @@ VerboseMultiSubmit, ReplaceHelpImg
- bug #3539044 [interface] Browse mode "Show" button gives blank page if no results anymore
- bug #3534979 [interface] Copy Database Ajax feedback vanishes long before copying is done
- bug #3527531 [interface] GC-maxlifetime warning incorrectly displayed
- bug #3526916 [interface] Search fails with JS error when tooltips disabled
3.5.2.0 (not yet released)
- bug #3521416 [interface] JS error when editing index

View File

@ -1524,10 +1524,12 @@ function PMA_ajaxRemoveMessage($this_msgbox)
.stop(true, true)
.fadeOut('medium');
if ($this_msgbox.is('.dismissable')) {
// Here we should destroy the qtip instance, but
// due to a bug in qtip's implementation we can
// only hide it without throwing JS errors.
$this_msgbox.qtip('hide');
if ($('#no_hint').length < 0) {
// Here we should destroy the qtip instance, but
// due to a bug in qtip's implementation we can
// only hide it without throwing JS errors.
$this_msgbox.qtip('hide');
}
} else {
$this_msgbox.remove();
}