diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-18 16:04:07 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-12-18 16:04:07 +0100 |
| commit | 628e565a6c5ee52341ba6de0b5ecf6495cbb78f8 (patch) | |
| tree | 737c1027334a211b62b4a278f87be80bb7e17a4c /include/bb2diaspora.php | |
| parent | a721f39945bf3213c4305a389946c464b831a5f9 (diff) | |
| parent | 84bf7058119bb2ed48358678be9c212a66c8cb83 (diff) | |
| download | volse-hubzilla-628e565a6c5ee52341ba6de0b5ecf6495cbb78f8.tar.gz volse-hubzilla-628e565a6c5ee52341ba6de0b5ecf6495cbb78f8.tar.bz2 volse-hubzilla-628e565a6c5ee52341ba6de0b5ecf6495cbb78f8.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/bb2diaspora.php')
| -rw-r--r-- | include/bb2diaspora.php | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php index 1be7caa19..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,6 +324,8 @@ function bb2diaspora_itembody($item, $force_update = false) { } } + create_export_photo_body($item); + $newitem = $item; if(array_key_exists('item_obscured',$item) && intval($item['item_obscured'])) { @@ -346,6 +339,7 @@ function bb2diaspora_itembody($item, $force_update = false) { } } + bb2diaspora_itemwallwall($newitem); $title = $newitem['title']; |