[geeklog-cvs] Geeklog-1.x/plugins/calendar functions.inc, 1.91, 1.92 install_defaults.php, 1.6, 1.7

[Michael Jervis]

Update of /cvsroot/geeklog/Geeklog-1.x/plugins/calendar
In directory qs1489.pair.com:/tmp/cvs-serv22523/plugins/calendar

Modified Files:
	functions.inc install_defaults.php 
Log Message:
Reverting: Bug 663 - Invalid use of global in plugins [LWC]
Because it was a faulty assumption and my testing was crap.

Index: functions.inc
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/functions.inc,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** functions.inc	29 Jun 2008 19:02:49 -0000	1.91
--- functions.inc	3 Jul 2008 18:00:50 -0000	1.92
***************
*** 123,127 ****
              $eventSql .= "WHERE dateend >= DATEADD(hh, 24, NOW()) AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) ";
          } else {
!             $eventSql .= "WHERE dateend >= (getUTCDate() - INTERVAL 24 HOUR) AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) ";            
          }
          $eventSql .= 'ORDER BY datestart,timestart';
--- 123,127 ----
              $eventSql .= "WHERE dateend >= DATEADD(hh, 24, NOW()) AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) ";
          } else {
!             $eventSql .= "WHERE dateend >= (NOW() - INTERVAL 24 HOUR) AND (TO_DAYS(datestart) - TO_DAYS(NOW()) < $range) ";            
          }
          $eventSql .= 'ORDER BY datestart,timestart';

Index: install_defaults.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/plugins/calendar/install_defaults.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** install_defaults.php	1 Jul 2008 19:42:02 -0000	1.6
--- install_defaults.php	3 Jul 2008 18:00:50 -0000	1.7
***************
*** 50,54 ****
   *
   */
! 
  $_CA_DEFAULT = array();
  
--- 50,54 ----
   *
   */
! global $_CA_DEFAULT;
  $_CA_DEFAULT = array();