From 7e4d4cf375a35f66b2510551148a6f994fc1cf11 Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Mon, 4 Feb 2013 20:45:14 -0700 Subject: [PATCH] limit event queries to one month even if no finish date is specified --- mod/events.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mod/events.php b/mod/events.php index be8b843177..c13f31c988 100755 --- a/mod/events.php +++ b/mod/events.php @@ -260,13 +260,15 @@ function events_content(&$a) { $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`, `item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event` LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` WHERE `event`.`uid` = %d and event.ignore = %d - AND (( `adjust` = 0 AND ( `finish` >= '%s' or nofinish ) AND `start` <= '%s' ) - OR ( `adjust` = 1 AND ( `finish` >= '%s' or nofinish ) AND `start` <= '%s' )) ", + AND (( `adjust` = 0 AND ( `finish` >= '%s' OR ( nofinish AND start >= '%s' ) ) AND `start` <= '%s' ) + OR ( `adjust` = 1 AND ( `finish` >= '%s' OR ( nofinish AND start >= '%s' ) ) AND `start` <= '%s' )) ", intval(local_user()), intval($ignored), dbesc($start), + dbesc($start), dbesc($finish), dbesc($adjust_start), + dbesc($adjust_start), dbesc($adjust_finish) ); }