[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[13992] trunk

[<lph...@us...>]

Revision: 13992
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=13992&view=rev
Author:   lphuberdeau
Date:     2008-07-31 20:09:04 +0000 (Thu, 31 Jul 2008)

Log Message:
-----------
[ROLLBACK] r13990 Not ready yet, too many tabs open

Modified Paths:
--------------
    trunk/lib/calendar/calendarlib.php
    trunk/modules/mod-upcoming_events.php

Modified: trunk/lib/calendar/calendarlib.php
===================================================================
--- trunk/lib/calendar/calendarlib.php	2008-07-31 20:04:24 UTC (rev 13991)
+++ trunk/lib/calendar/calendarlib.php	2008-07-31 20:09:04 UTC (rev 13992)
@@ -586,7 +586,7 @@
 		return true;
 	}
 
-	function upcoming_events($maxrows = -1, $calendarId = 0, $maxDays = -1, $order = 'start_asc', $priorDays = 0) {
+	function upcoming_events($maxrows = -1, $calendarId = 0, $maxDays = -1, $order = 'start_asc') {
 		$cond = '';
 		$bindvars = array();
 		if(is_array($calendarId) && count($calendarId) > 0) {
@@ -595,14 +595,12 @@
 				$cond = $cond." or i.`calendarId` = ? ";
 			}
 			$cond = $cond.")";
-			$bindvars = array_merge( $bindvars, $calendarId );
+			$bindvars += $calendarId;
 		} elseif (!is_array($calendarId) and $calendarId > 0) {
 			$cond = $cond." and i.`calendarId` = ? ";
-			$bindvars[] = $calendarId;
+			$bindvars += array($calendarId);
 		}
-		$cond .= " and `end` >= (unix_timestamp(now()) - ?*3600*34)";
-		$bindvars[] = $priorDays;
-
+		$cond .= " and `end` >= (unix_timestamp(now()))";
 		if($maxDays > 0)
 		{
 			$maxSeconds = ($maxDays * 24 * 60 * 60);

Modified: trunk/modules/mod-upcoming_events.php
===================================================================
--- trunk/modules/mod-upcoming_events.php	2008-07-31 20:04:24 UTC (rev 13991)
+++ trunk/modules/mod-upcoming_events.php	2008-07-31 20:09:04 UTC (rev 13992)
@@ -39,13 +39,9 @@
 }
 
 $events = array();
-if (!empty($viewable))
-	$events = $calendarlib->upcoming_events($module_rows,
-		array_intersect(isset($module_params["calendarId"]) ? array($module_params["calendarId"]) : $calIds, $viewable),
-		isset($module_params["maxDays"]) ? $module_params["maxDays"] : 365,
-		'start_asc', 
-		isset($module_params["priorDays"]) ? (int) $modile_params["priorDays"] : 0
-	);
+if (!empty($viewable))  $events = $calendarlib->upcoming_events($module_rows,
+    array_intersect(isset($module_params["calendarId"]) ? array($module_params["calendarId"]) : $calIds, $viewable),
+    isset($module_params["maxDays"]) ? $module_params["maxDays"] : 365);
 $smarty->assign('modUpcomingEvents', $events);
 $smarty->assign('maxlen', isset($module_params["maxlen"]) ? $module_params["maxlen"] : 0);
 $smarty->assign('nonums', isset($module_params["nonums"]) ? $module_params["nonums"] : 'n');


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.