harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into tres

Browse Source 
Conflicts:
	mod/events.php
	view/css/mod_events.css
This commit is contained in:
friendica
2015-02-08 20:57:37 -08:00
parent 4b348d2489 247579ebf1
commit 08b757a22c
97 changed files with 9030 additions and 7689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mod/ping.php
View File

@@ -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':