diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-07-31 07:38:44 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-07-31 07:38:44 -0400 |
| commit | 42b718b3e0fcd44c734a3faf385b29d05c614fe3 (patch) | |
| tree | 2da9feeccd41afe24ac6c73c3ce88e2df43ac9ef /Zotlabs | |
| parent | 1e3a645abedcd77c10a855f1e821dfe7fc072aeb (diff) | |
| parent | da9b6690e565452a9a9d69084a07ac48005d7e60 (diff) | |
| download | volse-hubzilla-42b718b3e0fcd44c734a3faf385b29d05c614fe3.tar.gz volse-hubzilla-42b718b3e0fcd44c734a3faf385b29d05c614fe3.tar.bz2 volse-hubzilla-42b718b3e0fcd44c734a3faf385b29d05c614fe3.zip | |
Merge remote-tracking branch 'upstream/dev' into website-import
Diffstat (limited to 'Zotlabs')
| -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')) |