[geeklog-cvs] geeklog-1.3/public_html calendar_event.php,1.38,1.39

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/public_html
In directory www:/tmp/cvs-serv11559

Modified Files:
	calendar_event.php 
Log Message:
When displaying more than one event for a day, sort them by their start time.


Index: calendar_event.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/calendar_event.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** calendar_event.php	15 Dec 2004 14:55:09 -0000	1.38
--- calendar_event.php	9 Jan 2005 21:07:48 -0000	1.39
***************
*** 495,499 ****
  
          $thedate = sprintf ('%4d-%02d-%02d', $year, $month, $day);
!         $datesql = "SELECT *,datestart AS start,dateend AS end FROM {$_TABLES['events']} WHERE \"$thedate\" BETWEEN DATE_FORMAT(datestart,'%Y-%m-%d') and DATE_FORMAT(dateend,'%Y-%m-%d') ORDER BY datestart ASC,title";
      }
      $cal_templates = new Template($_CONF['path_layout'] . 'calendar');
--- 495,499 ----
  
          $thedate = sprintf ('%4d-%02d-%02d', $year, $month, $day);
!         $datesql = "SELECT *,datestart AS start,dateend AS end FROM {$_TABLES['events']} WHERE \"$thedate\" BETWEEN DATE_FORMAT(datestart,'%Y-%m-%d') and DATE_FORMAT(dateend,'%Y-%m-%d') ORDER BY datestart ASC,timestart ASC,title";
      }
      $cal_templates = new Template($_CONF['path_layout'] . 'calendar');