harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move photo object stuff from itemObject to prepare_body() so we can do more stuff with it

Browse Source
This commit is contained in:
Mario Vavti
2015-10-22 10:52:10 +02:00
parent eb947acebe
commit 6f8d29ad80
5 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/ItemObject.php
View File

@@ -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