diff options
| author | friendica <info@friendica.com> | 2013-01-16 03:18:32 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-01-16 03:18:32 -0800 |
| commit | af066d7383edfc9c47ceb64076ec38efd6f39edb (patch) | |
| tree | b97da0065416bdabf5f8948652f6d5757f2f197b /include/zot.php | |
| parent | 4fd833b9530c93b71dcb2b1587a4b3c5869915ce (diff) | |
| download | volse-hubzilla-af066d7383edfc9c47ceb64076ec38efd6f39edb.tar.gz volse-hubzilla-af066d7383edfc9c47ceb64076ec38efd6f39edb.tar.bz2 volse-hubzilla-af066d7383edfc9c47ceb64076ec38efd6f39edb.zip | |
mopping up the events issues so I can move on to other stuff
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/zot.php b/include/zot.php index f01b0f63f..28ecdc4dc 100644 --- a/include/zot.php +++ b/include/zot.php @@ -893,7 +893,7 @@ function process_delivery($sender,$arr,$deliveries,$relay) { // for events, extract the event info and create and event linked to an item - if((x($arr,'obj_type')) && (activity_compare($arr['obj_type'],ACTIVITY_OBJ_EVENT))) { + if((x($arr,'obj_type')) && (activity_match($arr['obj_type'],ACTIVITY_OBJ_EVENT))) { require_once('include/event.php'); $ev = bbtoevent($arr['body']); if(x($ev,'desc') && x($ev,'start')) { @@ -905,13 +905,15 @@ function process_delivery($sender,$arr,$deliveries,$relay) { // is this an edit? $r = q("SELECT * FROM event left join item on resource_id = event_hash WHERE resource_type = 'event' and - `uri` = '%s' AND `uid` = %d LIMIT 1", + `uri` = '%s' AND event.uid = %d LIMIT 1", dbesc($arr['uri']), - intval($importer['uid']) + intval($channel['channel_id']) ); if($r) $ev['event_hash'] = $r[0]['event_hash']; + dbg(1); $xyz = event_store($ev); + dbg(0); $result = array($d['hash'],'event processed'); continue; } |