Merge remote-tracking branch 'origin/master'

2011-06-22 00:40:07 +02:00 · 2011-06-22 00:40:07 +02:00 · 6e07523f9f
commit 6e07523f9f
parent eeee28aff6 d67f457421
1 changed files with 1 additions and 1 deletions
--- a/js/functions.js
+++ b/js/functions.js
@ -2463,7 +2463,7 @@ function PMA_slidingMessage(msg, $obj) {
        // Don't show an empty message
        return false;
    }
-    if ($obj == undefined || ! $obj instanceof jQuery) {
+    if ($obj == undefined || ! $obj instanceof jQuery || $obj.length == 0) {
        // If the second argument was not supplied,
        // we might have to create a new DOM node.
        if ($('#PMA_slidingMessage').length == 0) {