diff options
Diffstat (limited to 'include/bb2diaspora.php')
| -rw-r--r-- | include/bb2diaspora.php | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index e2ce3f1b0..81b95b30b 100644 --- a/include/bb2diaspora.php +++ b/include/bb2diaspora.php @@ -305,15 +305,6 @@ function bb2diaspora_itembody($item, $force_update = false) { $matches = array(); - //if we have a photo item just prepend the photo bbcode to item['body'] - $is_photo = (($item['obj_type'] == ACTIVITY_OBJ_PHOTO) ? true : false); - if($is_photo) { - $object = json_decode($item['object'],true); - if($object['bbcode']) { - $item['body'] = (($item['body']) ? $object['bbcode'] . "\r\n" . $item['body'] : $object['bbcode']); - } - } - if(($item['diaspora_meta']) && (! $force_update)) { $diaspora_meta = json_decode($item['diaspora_meta'],true); if($diaspora_meta) { @@ -333,16 +324,7 @@ function bb2diaspora_itembody($item, $force_update = false) { } } - - // since November 2015 linked photo items don't or at least may not have a body. Recreate one. - - if(($item['verb'] === ACTIVITY_POST) && ($item['obj_type'] === ACTIVITY_OBJ_PHOTO) && (! trim($item['body']))) { - $j = json_decode($item['object'],true); - if($j) { - $item['body'] = $j['bbcode']; - $item['sig'] = ''; - } - } + create_export_photo_body($item); $newitem = $item; |