diff options
| author | Max Kostikov <max@kostikov.co> | 2020-04-08 11:34:29 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2020-04-08 11:34:29 +0200 |
| commit | 2c8a243ece79af05e30b1926bd372698d30f7aab (patch) | |
| tree | 9cc868f56a5456c59eb6e230803f2966c2ce9735 /Zotlabs/Lib | |
| parent | 3372fb0761353f646ae2b7bd168650eea5fd6211 (diff) | |
| parent | af7a31cd1400a6b2f21e7c0a622ab448179f0ef8 (diff) | |
| download | volse-hubzilla-2c8a243ece79af05e30b1926bd372698d30f7aab.tar.gz volse-hubzilla-2c8a243ece79af05e30b1926bd372698d30f7aab.tar.bz2 volse-hubzilla-2c8a243ece79af05e30b1926bd372698d30f7aab.zip | |
Merge branch 'dev' into 'dev'
# Conflicts:
# Zotlabs/Daemon/Expire.php
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/Activity.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php index 02ec7614e..3c16a5367 100644 --- a/Zotlabs/Lib/Activity.php +++ b/Zotlabs/Lib/Activity.php @@ -323,6 +323,11 @@ class Activity { return $ret; } + + if ($i['obj']) { + $ret = Activity::encode_object($i['obj']); + } + $ret['type'] = $objtype; if ($objtype === 'Question') { @@ -507,7 +512,7 @@ class Activity { if ($item['iconfig']) { foreach ($item['iconfig'] as $att) { if ($att['sharing']) { - $value = ((preg_match('|^a:[0-9]+:{.*}$|s', $att['v'])) ? unserialize($att['v']) : $att['v']); + $value = ((is_string($att['v']) && preg_match('|^a:[0-9]+:{.*}$|s', $att['v'])) ? unserialize($att['v']) : $att['v']); $ret[] = [ 'type' => 'PropertyValue', 'name' => 'zot.' . $att['cat'] . '.' . $att['k'], 'value' => $value ]; } } |