diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-04-19 15:34:02 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2019-04-19 15:34:02 +0200 |
| commit | 39a53113153cd5ddd985d4c1fd177c3e5fb70884 (patch) | |
| tree | 0f855774b37fd28153638d05bdd953d4f83b95e7 /include | |
| parent | 9b6e46dc6b245a229b0b5af0efea88c2838ce56a (diff) | |
| parent | fb03e3f00e14c424062253edc1a0f76817493b05 (diff) | |
| download | volse-hubzilla-39a53113153cd5ddd985d4c1fd177c3e5fb70884.tar.gz volse-hubzilla-39a53113153cd5ddd985d4c1fd177c3e5fb70884.tar.bz2 volse-hubzilla-39a53113153cd5ddd985d4c1fd177c3e5fb70884.zip | |
Merge branch 'dev' into calendar_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/event.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/event.php b/include/event.php index 750d1add1..cfca00a3c 100644 --- a/include/event.php +++ b/include/event.php @@ -4,8 +4,11 @@ * @brief Event related functions. */ + use Sabre\VObject; +use Zotlabs\Lib\Activity; + use Ramsey\Uuid\Uuid; use Ramsey\Uuid\Exception\UnsatisfiedDependencyException; @@ -65,7 +68,7 @@ function format_event_html($ev) { } function format_event_obj($jobject) { - $event = array(); + $event = []; $object = json_decode($jobject,true); @@ -1046,6 +1049,7 @@ function event_store_item($arr, $event) { 'location' => $arr['location'], 'adjust' => $arr['adjust'], 'content' => format_event_bbcode($arr), + 'attachment' => Activity::encode_attachment($r[0]), 'author' => array( 'name' => $r[0]['xchan_name'], 'address' => $r[0]['xchan_addr'], @@ -1200,6 +1204,7 @@ function event_store_item($arr, $event) { 'location' => $arr['location'], 'adjust' => $arr['adjust'], 'content' => format_event_bbcode($arr), + 'attachment' => Activity::encode_attachment($item_arr), 'author' => array( 'name' => $x[0]['xchan_name'], 'address' => $x[0]['xchan_addr'], |