diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/event.php | 5 | ||||
| -rw-r--r-- | include/items.php | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/event.php b/include/event.php index 208ba1e1f..2cfc52408 100644 --- a/include/event.php +++ b/include/event.php @@ -193,6 +193,7 @@ function event_store($arr) { $arr['edited'] = (($arr['edited']) ? $arr['edited'] : datetime_convert()); $arr['type'] = (($arr['type']) ? $arr['type'] : 'event' ); $arr['cid'] = ((intval($arr['cid'])) ? intval($arr['cid']) : 0); + $arr['uri'] = (x($arr,'uri') ? $arr['uri'] : item_new_uri($a->get_hostname(),$arr['uid'])); if($arr['cid']) $c = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", @@ -250,14 +251,12 @@ function event_store($arr) { } else { - $uri = item_new_uri($a->get_hostname(),local_user()); - $r = q("INSERT INTO `event` ( `uid`,`cid`,`uri`,`created`,`edited`,`start`,`finish`,`desc`,`location`,`type`, `adjust`,`nofinish`,`allow_cid`,`allow_gid`,`deny_cid`,`deny_gid`) VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s' ) ", intval($arr['uid']), intval($arr['cid']), - dbesc($uri), + dbesc($arr['uri']), dbesc($arr['created']), dbesc($arr['edited']), dbesc($arr['start']), diff --git a/include/items.php b/include/items.php index 514bd1efa..dc177c468 100644 --- a/include/items.php +++ b/include/items.php @@ -1338,6 +1338,8 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee $ev = bbtoevent($datarray['body']); if(x($ev,'desc') && x($ev,'start')) { $ev['uid'] = $importer['uid']; + $ev['uri'] = $item_id; + if(is_array($contact)) $ev['cid'] = $contact['id']; $r = q("SELECT * FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", |