diff options
| author | friendica <info@friendica.com> | 2012-06-07 15:48:04 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-06-07 15:48:04 -0700 |
| commit | 67d8afb9d18df137fddc991443f9b796b5821210 (patch) | |
| tree | c9f505934f64e6bfa30a9cab64f6732c8ea9537d /mod/events.php | |
| parent | c4aeb57fcda6253fd9ca91b5177a17b97e3c9b70 (diff) | |
| parent | f4a80fcf2474a13b2d733f59f1a928b40841d83c (diff) | |
| download | volse-hubzilla-67d8afb9d18df137fddc991443f9b796b5821210.tar.gz volse-hubzilla-67d8afb9d18df137fddc991443f9b796b5821210.tar.bz2 volse-hubzilla-67d8afb9d18df137fddc991443f9b796b5821210.zip | |
Merge https://github.com/friendica/friendica into pull
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), |