diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-10-22 17:20:52 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-10-22 17:20:52 -0700 |
| commit | 4c406ec9c03d5f4c30d6ede7fbb0b93b3ff97885 (patch) | |
| tree | bd8cdd8b073503c95edae81c628464e8171a59aa /include/ItemObject.php | |
| parent | 500b896d50c7c31e3b5d1e2b329e77a2c45561dd (diff) | |
| parent | 18a239e8084305cd2b5b454386cb3948b48880fc (diff) | |
| download | volse-hubzilla-4c406ec9c03d5f4c30d6ede7fbb0b93b3ff97885.tar.gz volse-hubzilla-4c406ec9c03d5f4c30d6ede7fbb0b93b3ff97885.tar.bz2 volse-hubzilla-4c406ec9c03d5f4c30d6ede7fbb0b93b3ff97885.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'include/ItemObject.php')
| -rw-r--r-- | include/ItemObject.php | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index 9fe86118c..c5c2cb2e6 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -278,17 +278,6 @@ class Item extends BaseObject { $children = $this->get_children(); - $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'] - ); - } - $has_tags = (($body['tags'] || $body['categories'] || $body['mentions'] || $body['attachments'] || $body['folders']) ? true : false); $tmp_item = array( @@ -342,8 +331,7 @@ 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 : ''), + 'photo' => $body['photo'], 'has_tags' => $has_tags, // Item toolbar buttons |