r57 - in phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker: DB docs

Sebastian Bergmann at BerliOS <[email protected]> Wed, 14 Sep 2005 07:55:24 +0200
Newsgroups gmane.comp.web.phpopentracker.cvs
Message-ID <[email protected]>
Author: s_bergmann
Date: 2005-09-14 07:54:49 +0200 (Wed, 14 Sep 2005)
New Revision: 57

Modified:
   phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/DB/mysql_merge.php
   phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/docs/NEWS
Log:
Fix bug #5054.

Modified: phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/DB/mysql_merge.php
===================================================================
--- phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/DB/mysql_merge.php	2005-07-30 10:42:44 UTC (rev 56)
+++ phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/DB/mysql_merge.php	2005-09-14 05:54:49 UTC (rev 57)
@@ -485,12 +485,12 @@
     $accesslogTables = array();
     $visitorsTables  = array();
 
-    $startDay   = $day   = date('d', $parsedQuery[$between + 1]);
-    $startMonth = $month = date('m', $parsedQuery[$between + 1]);
-    $startYear  = $year  = date('Y', $parsedQuery[$between + 1]);
-    $endDay              = date('d', $parsedQuery[$between + 3]);
-    $endMonth            = date('m', $parsedQuery[$between + 3]);
-    $endYear             = date('Y', $parsedQuery[$between + 3]);
+    $startDay   = $day   = date('d', (integer)$parsedQuery[$between + 1]);
+    $startMonth = $month = date('m', (integer)$parsedQuery[$between + 1]);
+    $startYear  = $year  = date('Y', (integer)$parsedQuery[$between + 1]);
+    $endDay              = date('d', (integer)$parsedQuery[$between + 3]);
+    $endMonth            = date('m', (integer)$parsedQuery[$between + 3]);
+    $endYear             = date('Y', (integer)$parsedQuery[$between + 3]);
 
     $done                  = false;
     $numDaysInCurrentMonth = $this->_numDaysInMonth($month, $year);

Modified: phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/docs/NEWS
===================================================================
--- phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/docs/NEWS	2005-07-30 10:42:44 UTC (rev 56)
+++ phpOpenTracker/branches/phpOpenTracker-1.5/phpOpenTracker/docs/NEWS	2005-09-14 05:54:49 UTC (rev 57)
@@ -1,6 +1,6 @@
 (+ Added, * Changed, - Removed, ! Note)
 
-  * Fixed bug #4624.
+  * Fixed bugs #4624, #5054.
 
 30-Jun-2005, Version 1.5.1