diff options
| author | zottel <github@zottel.net> | 2016-07-31 02:14:33 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2016-07-31 02:14:33 +0200 |
| commit | b5ea20ac863ebdbc4cc0bad6b7ca9876df336e8f (patch) | |
| tree | d09bc96d4f78df033b76513242bbb80ff57240bd /Zotlabs/Module/Ping.php | |
| parent | e5a3179468c84ab78ffa655353bc068508e8cdfd (diff) | |
| parent | da9b6690e565452a9a9d69084a07ac48005d7e60 (diff) | |
| download | volse-hubzilla-b5ea20ac863ebdbc4cc0bad6b7ca9876df336e8f.tar.gz volse-hubzilla-b5ea20ac863ebdbc4cc0bad6b7ca9876df336e8f.tar.bz2 volse-hubzilla-b5ea20ac863ebdbc4cc0bad6b7ca9876df336e8f.zip | |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'Zotlabs/Module/Ping.php')
| -rw-r--r-- | Zotlabs/Module/Ping.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index 5cbf45daa..e01c3b49a 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -173,7 +173,7 @@ class Ping extends \Zotlabs\Web\Controller { ); break; case 'all_events': - $r = q("update event set `dimissed` = 1 where `dismissed` = 0 and uid = %d AND dtstart < '%s' AND dtstart > '%s' ", + $r = q("update event set `dismissed` = 1 where `dismissed` = 0 and uid = %d AND dtstart < '%s' AND dtstart > '%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')) |