diff options
| author | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-06-11 20:47:11 +0530 |
|---|---|---|
| committer | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-06-11 20:47:11 +0530 |
| commit | 11974b4d948ae5d9b9fb53970838463bd88bb9f6 (patch) | |
| tree | 426724e218a2fcaf3a1a2eedf6ffa591299755ee /mod/events.php | |
| parent | 079fdecff1f4daa534045f4bd857e6ae6324474d (diff) | |
| parent | afa88154114d5632cb13e7c3f56143cccdfd7daa (diff) | |
| download | volse-hubzilla-11974b4d948ae5d9b9fb53970838463bd88bb9f6.tar.gz volse-hubzilla-11974b4d948ae5d9b9fb53970838463bd88bb9f6.tar.bz2 volse-hubzilla-11974b4d948ae5d9b9fb53970838463bd88bb9f6.zip | |
Merge branch 'master' of git://github.com/friendica/friendica
Diffstat (limited to 'mod/events.php')
| -rwxr-xr-x[-rw-r--r--] | mod/events.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/events.php b/mod/events.php index 069046ff9..2a6fb692e 100644..100755 --- a/mod/events.php +++ b/mod/events.php @@ -230,8 +230,8 @@ 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 (( `adjust` = 0 AND `start` >= '%s' AND `start` <= '%s' ) - OR ( `adjust` = 1 AND `start` >= '%s' AND `start` <= '%s' )) ", + AND (( `adjust` = 0 AND `finish` >= '%s' AND `start` <= '%s' ) + OR ( `adjust` = 1 AND `finish` >= '%s' AND `start` <= '%s' )) ", intval(local_user()), dbesc($start), dbesc($finish), |