aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib/Activity.php
diff options
context:
space:
mode:
Diffstat (limited to 'Zotlabs/Lib/Activity.php')
-rw-r--r--Zotlabs/Lib/Activity.php7
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 ];
}
}