aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-01-13 17:32:42 -0800
committerredmatrix <git@macgirvin.com>2016-01-13 17:32:42 -0800
commit82aec69302ebc4d3b7554c4428d9a656434917c3 (patch)
tree9015986c93a35c8b05de57e107a4c32bd786ce7e
parent9584ca080c10777407c59c5939dd0cf2a88a847b (diff)
parente1ddee6c26f149e7fd5262b5d45217af81f4ec64 (diff)
downloadvolse-hubzilla-82aec69302ebc4d3b7554c4428d9a656434917c3.tar.gz
volse-hubzilla-82aec69302ebc4d3b7554c4428d9a656434917c3.tar.bz2
volse-hubzilla-82aec69302ebc4d3b7554c4428d9a656434917c3.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
-rw-r--r--mod/share.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/share.php b/mod/share.php
index 7ed6cf9a6..198a6b210 100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -45,7 +45,7 @@ function share_init(&$a) {
$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'];
+ $photo_bb = $object['body'];
}
if (strpos($r[0]['body'], "[/share]") !== false) {