diff options
Diffstat (limited to 'include')
| -rwxr-xr-x | include/items.php | 2 | ||||
| -rw-r--r-- | include/text.php | 7 | ||||
| -rw-r--r-- | include/zot.php | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/include/items.php b/include/items.php index 30e758add..51aa81017 100755 --- a/include/items.php +++ b/include/items.php @@ -4688,7 +4688,7 @@ function sync_an_item($channel_id,$item_id) { if($r) { xchan_query($r); $sync_item = fetch_post_tags($r); - build_sync_packet($channel_d,array('item' => array(encode_item($sync_item[0],true)))); + build_sync_packet($channel_id, array('item' => array(encode_item($sync_item[0],true)))); } } diff --git a/include/text.php b/include/text.php index 6dac5ccc7..ec3eb7b10 100644 --- a/include/text.php +++ b/include/text.php @@ -1682,7 +1682,12 @@ function prepare_body(&$item,$attach = false,$opts = false) { $s .= prepare_binary($item); } else { - $s .= prepare_text($item['body'],$item['mimetype'], $opts); + if($item['summary']) { + $s .= prepare_text('[summary]' . $item['summary'] . '[/summary]' . $item['body'],$item['mimetype'],$opts); + } + else { + $s .= prepare_text($item['body'],$item['mimetype'], $opts); + } } $event = (($item['obj_type'] === ACTIVITY_OBJ_EVENT) ? format_event_obj($item['obj']) : false); diff --git a/include/zot.php b/include/zot.php index 3b089831b..c9c01103c 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1840,7 +1840,7 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $ intval($channel['channel_id']) ); if ($parent) { - $allowed = can_comment_on_post($d['hash'],$parent[0]); + $allowed = can_comment_on_post($sender['hash'],$parent[0]); } } |