diff options
| author | friendica <info@friendica.com> | 2015-02-08 20:57:37 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-02-08 20:57:37 -0800 |
| commit | 08b757a22cd2804bfec8ecf682b6987b8c06ca49 (patch) | |
| tree | 477f3a8e84388aab2a4f3c938a166597c7467d19 /mod/ping.php | |
| parent | 4b348d248975ba07ba9cea62f51eb52d6afb5645 (diff) | |
| parent | 247579ebf13ead372eee87bd2351078f7219321e (diff) | |
| download | volse-hubzilla-08b757a22cd2804bfec8ecf682b6987b8c06ca49.tar.gz volse-hubzilla-08b757a22cd2804bfec8ecf682b6987b8c06ca49.tar.bz2 volse-hubzilla-08b757a22cd2804bfec8ecf682b6987b8c06ca49.zip | |
Merge branch 'master' into tres
Conflicts:
mod/events.php
view/css/mod_events.css
Diffstat (limited to 'mod/ping.php')
| -rw-r--r-- | mod/ping.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mod/ping.php b/mod/ping.php index e13dc5de2..a15f4c925 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -168,8 +168,10 @@ function ping_init(&$a) { ); break; case 'all_events': - $r = q("update event set `ignore` = 1 where `ignore` = 0 and uid = %d", - intval(local_channel()) + $r = q("update event set `ignore` = 1 where `ignore` = 0 and uid = %d AND start < '%s' AND start > '%s' ", + intval(local_channel()), + dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')), + dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days')) ); break; case 'notify': |