From 69b5efe42689316692f7ceddce70f39febc5e057 Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Mon, 14 Nov 2005 10:59:40 +0000
Subject: [PATCH] pmaTooltip(): no return value, additional check

---
 ChangeLog            |  1 +
 libraries/tooltip.js | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a8033839c..469f7e32f 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@ $Source$
 2005-11-14 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * themes/*/css/theme_right.css.php, css/phpmyadmin.css.php:
       bug #1342683 Wrong URL to error.ico
+    * libraries/tooltip.js: no return value, additional check
 
 2005-11-13 Michal Čihař  <michal@cihar.com>
     * Documentation.html, config.default.php, main.php, server_links.inc.php,
diff --git a/libraries/tooltip.js b/libraries/tooltip.js
index 1d04be9af..766ade8fc 100644
--- a/libraries/tooltip.js
+++ b/libraries/tooltip.js
@@ -43,10 +43,10 @@ function textTooltip(theText) {
         layerNS4.write(theText);
         layerNS4.close();
     }
-}    
+}
 
 /**
- * @var integer 
+ * @var integer
  */
 var ttTimerID = 0;
 
@@ -127,7 +127,7 @@ function moveTooltip(posX, posY) {
  *
  * @param    string    theText    tooltip content
  */
-function pmaTooltip(theText) {
+function pmaTooltip( theText ) {
     // reference to TooltipContainer
     if ( null == myTooltipContainer ) {
         if (ttNS4) {
@@ -137,10 +137,14 @@ function pmaTooltip(theText) {
         } else if (ttDOM) {
             myTooltipContainer = document.getElementById('TooltipContainer');
         } else {
-            return false;
+            return;
+        }
+
+        if ( typeof( myTooltipContainer ) == 'undefined' ) {
+            return;
         }
     }
-    
+
     var plusX=0, plusY=0, docX=0; docY=0;
     var divHeight = myTooltipContainer.clientHeight;
     var divWidth  = myTooltipContainer.clientWidth;
@@ -160,15 +164,15 @@ function pmaTooltip(theText) {
         docX = document.body.clientWidth;
         docY = document.body.clientHeight;
     }
-    
+
     ttXpos = ttXpos + plusX;
     ttYpos = ttYpos + plusY;
-    
+
     if ((ttXpos + divWidth) > docX)
         ttXpos = ttXpos - (divWidth + (ttXadd * 2));
     if ((ttYpos + divHeight) > docY)
         ttYpos = ttYpos - (divHeight + (ttYadd * 2));
-    
+
     textTooltip(theText);
     moveTooltip((ttXpos + ttXadd), (ttYpos + ttYadd));
     holdTooltip();