From ee07b9333276b3d8f318ed3d8222063e96d7d415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 10 Aug 2004 12:30:03 +0000
Subject: [PATCH] Forcibily use 10 as base for parsed numbers, otherwise
 accidentally octal numbers are expected (part of bug #1005865).

---
 ChangeLog               |  5 +++++
 libraries/tbl_change.js | 30 +++++++++++++++---------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2b43fc477..993374cc1 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-08-10 Michal Čihař  <michal@cihar.com>
+    * libraries/tbl_change.js: Forcibily use 10 as base for parsed numbers,
+      otherwise accidentally octal numbers are expected (part of bug
+      #1005865).
+
 2004-08-09 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/turkish update, thanks to Bora Alioglu
     * libraries/get_foreign.lib.php: bug 1005826, problem with foreign key
diff --git a/libraries/tbl_change.js b/libraries/tbl_change.js
index 4225c3f53..64569739e 100644
--- a/libraries/tbl_change.js
+++ b/libraries/tbl_change.js
@@ -194,22 +194,22 @@ function initCalendar() {
 
                     if (parts[1]) {
                         time    = parts[1].split(':');
-                        hour    = parseInt(time[0]);
-                        minute  = parseInt(time[1]);
-                        second  = parseInt(time[2]);
+                        hour    = parseInt(time[0],10);
+                        minute  = parseInt(time[1],10);
+                        second  = parseInt(time[2],10);
                     }
                 }
                 date        = value.split("-");
-                day         = parseInt(date[2]);
-                month       = parseInt(date[1]) - 1;
-                year        = parseInt(date[0]);
+                day         = parseInt(date[2],10);
+                month       = parseInt(date[1],10) - 1;
+                year        = parseInt(date[0],10);
             } else {
-                year        = parseInt(value.substr(0,4));
-                month       = parseInt(value.substr(4,2)) - 1;
-                day         = parseInt(value.substr(6,2));
-                hour        = parseInt(value.substr(8,2));
-                minute      = parseInt(value.substr(10,2));
-                second      = parseInt(value.substr(12,2));
+                year        = parseInt(value.substr(0,4),10);
+                month       = parseInt(value.substr(4,2),10) - 1;
+                day         = parseInt(value.substr(6,2),10);
+                hour        = parseInt(value.substr(8,2),10);
+                minute      = parseInt(value.substr(10,2),10);
+                second      = parseInt(value.substr(12,2),10);
             }
         }
         if (isNaN(year) || isNaN(month) || isNaN(day) || day == 0) {
@@ -333,9 +333,9 @@ function returnDate(d) {
     txt = d;
     if (window.opener.dateType != 'date') {
         // need to get time
-        h = parseInt(document.getElementById('hour').value);
-        m = parseInt(document.getElementById('minute').value);
-        s = parseInt(document.getElementById('second').value);
+        h = parseInt(document.getElementById('hour').value,10);
+        m = parseInt(document.getElementById('minute').value,10);
+        s = parseInt(document.getElementById('second').value,10);
         if (window.opener.dateType == 'datetime') {
             txt += ' ' + formatNum2(h, 'hour') + ':' + formatNum2(m, 'minute') + ':' + formatNum2(s, 'second');
         } else {