diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-10-22 10:56:24 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-10-22 10:56:24 +0200 |
| commit | 9cbca24f7a333187961d35a77e5426dc4f2e122e (patch) | |
| tree | e92ce52f017528977ec36f2bbbb2655c4ee786ad | |
| parent | 96f23758b4c0e2b997a8c3579639a57f5c533649 (diff) | |
| download | volse-hubzilla-9cbca24f7a333187961d35a77e5426dc4f2e122e.tar.gz volse-hubzilla-9cbca24f7a333187961d35a77e5426dc4f2e122e.tar.bz2 volse-hubzilla-9cbca24f7a333187961d35a77e5426dc4f2e122e.zip | |
photo object compatibility revamped
| -rw-r--r-- | include/ItemObject.php | 15 | ||||
| -rw-r--r-- | include/text.php | 9 | ||||
| -rwxr-xr-x | view/tpl/conv_item.tpl | 5 |
3 files changed, 9 insertions, 20 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index 0add87510..dea2f75bf 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -264,18 +264,7 @@ class Item extends BaseObject { localize_item($item); - $is_photo = (($item['obj_type'] == ACTIVITY_OBJ_PHOTO) ? true : false); - if($is_photo) { - $object = json_decode($item['object'],true); - $photo = array( - 'url' => rawurldecode($object['id']) . '?zid=' . $observer['xchan_addr'], - 'link' => rawurldecode(get_rel_link($object['link'],'alternate')) . '?zid=' . $observer['xchan_addr'], - 'width' => $object['width'], - 'height' => $object['height'] - ); - } - - $body .= prepare_body($item,true); + $body = prepare_body($item,true); // $viewthread (below) is only valid in list mode. If this is a channel page, build the thread viewing link // since we can't depend on llink or plink pointing to the right local location. @@ -335,8 +324,6 @@ class Item extends BaseObject { 'owner_url' => $this->get_owner_url(), 'owner_photo' => $this->get_owner_photo(), 'owner_name' => $this->get_owner_name(), - 'is_photo' => $is_photo, - 'photo' => (($is_photo) ? $photo : ''), // Item toolbar buttons 'like' => $like, diff --git a/include/text.php b/include/text.php index f4122845e..2a8905efe 100644 --- a/include/text.php +++ b/include/text.php @@ -1440,12 +1440,19 @@ function generate_named_map($location) { function prepare_body(&$item,$attach = false) { + require_once('include/identity.php'); call_hooks('prepare_body_init', $item); unobscure($item); - $s = prepare_text($item['body'],$item['mimetype']); + $is_photo = (($item['obj_type'] === ACTIVITY_OBJ_PHOTO) ? true : false); + if($is_photo) { + $object = json_decode($item['object'],true); + $s = '<a href="' . zid(rawurldecode(get_rel_link($object['link'],'alternate'))) . '"><img style="max-width:' . $object['width'] . 'px; width:100%; height:auto;" src="'. zid(rawurldecode($object['id'])) . '"></a>'; + } + + $s .= prepare_text($item['body'],$item['mimetype']); $prep_arr = array('item' => $item, 'html' => $s); call_hooks('prepare_body', $prep_arr); diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index c16e7d6a6..30a007bd6 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -33,11 +33,6 @@ <div class="wall-item-content" id="wall-item-content-{{$item.id}}"> <div class="wall-item-title-end"></div> <div class="wall-item-body" id="wall-item-body-{{$item.id}}" > - {{if $item.is_photo}} - <div class="wall-photo-item" id="wall-photo-item-{{$item.id}}"> - <a href="{{$item.photo.link}}"><img style="max-width:{{$item.photo.width}}px; width:100%; height:auto;" src={{$item.photo.url}}></a> - </div> - {{/if}} {{$item.body}} {{if $item.tags}} <div class="body-tag"> |