From: Zach Prezkuta Date: Tue, 5 Feb 2013 03:45:14 +0000 (-0700) Subject: limit event queries to one month even if no finish date is specified X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=7e4d4cf375a35f66b2510551148a6f994fc1cf11;p=friendica.git limit event queries to one month even if no finish date is specified --- 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) ); }