diff options
| author | mrjive <mrjive@mrjive.it> | 2015-11-11 16:51:48 +0100 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2015-11-11 16:51:48 +0100 |
| commit | 53a796afcc0cff6f9e3f51457df4506a43db1945 (patch) | |
| tree | a2366c48e0dae047b052283cc44284224369c8cd /mod/share.php | |
| parent | a4c3058f845a1c38d06b2201a10700c5f878366d (diff) | |
| parent | bc7c0ed844711e81c4bc642e3024849195a48421 (diff) | |
| download | volse-hubzilla-53a796afcc0cff6f9e3f51457df4506a43db1945.tar.gz volse-hubzilla-53a796afcc0cff6f9e3f51457df4506a43db1945.tar.bz2 volse-hubzilla-53a796afcc0cff6f9e3f51457df4506a43db1945.zip | |
Merge pull request #8 from redmatrix/master
get fresh code from HZ base
Diffstat (limited to 'mod/share.php')
| -rw-r--r-- | mod/share.php | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mod/share.php b/mod/share.php index d5a389bdf..7ed6cf9a6 100644 --- a/mod/share.php +++ b/mod/share.php @@ -42,6 +42,12 @@ function share_init(&$a) { xchan_query($r); + $is_photo = (($r[0]['obj_type'] === ACTIVITY_OBJ_PHOTO) ? true : false); + if($is_photo) { + $object = json_decode($r[0]['object'],true); + $photo_bb = $object['bbcode']; + } + if (strpos($r[0]['body'], "[/share]") !== false) { $pos = strpos($r[0]['body'], "[share"); $o = substr($r[0]['body'], $pos); @@ -53,9 +59,9 @@ function share_init(&$a) { "' posted='".$r[0]['created']. "' message_id='".$r[0]['mid']."']"; if($r[0]['title']) - $o .= '[b]'.$r[0]['title'].'[/b]'."\n"; - $o .= $r[0]['body']; - $o.= "[/share]"; + $o .= '[b]'.$r[0]['title'].'[/b]'."\r\n"; + $o .= (($is_photo) ? $photo_bb . "\r\n" . $r[0]['body'] : $r[0]['body']); + $o .= "[/share]"; } if(local_channel()) { |