diff --git a/ChangeLog b/ChangeLog
index 317ea1c31..49f1976c5 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,7 +23,8 @@ $Source$
     * fixed minimum_common for css files
     * header.inc.php: missing ; after &quot
     * libraries/function.js::pdfPaperSize()
-      - javascript warning: function does not always return a vlaue
+      - function does not always return a vlaue
+      - undeclared variables
 
 2005-11-17 Marc Delisle  <lem9@users.sourceforge.net>
     * Documentation.html: patch #1353283, thanks to Isaac Bennetch
diff --git a/libraries/functions.js b/libraries/functions.js
index a2f107f95..d6bf124c8 100644
--- a/libraries/functions.js
+++ b/libraries/functions.js
@@ -357,11 +357,12 @@ function checkTableEditForm(theForm, fieldsCnt)
     // on the form but has not completed at least one field name
 
     var atLeastOneField = 0;
+    var i, elm, elm2, elm3, val, id;
 
     for (i=0; i<fieldsCnt; i++)
     {
-        var id = "field_" + i + "_2";
-        var elm = getElement(id);
+        id = "field_" + i + "_2";
+        elm = getElement(id);
         if (elm.value == 'VARCHAR' || elm.value == 'CHAR') {
             elm2 = getElement("field_" + i + "_3");
             val = parseInt(elm2.value);
@@ -375,7 +376,7 @@ function checkTableEditForm(theForm, fieldsCnt)
         }
 
         if (atLeastOneField == 0) {
-            var id = "field_" + i + "_1";
+            id = "field_" + i + "_1";
             if (!emptyCheckTheField(theForm, id)) {
                 atLeastOneField = 1;
             }