diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-10-25 14:33:57 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-10-25 14:33:57 -0700 |
| commit | b67397861c75e8da465d2a730b1e75b6bd0a72ee (patch) | |
| tree | 3f9f27b267eb15f435a7e0457017382919b3c962 /include/text.php | |
| parent | de15a2ace16f4499945edb90f0e3645ad537ef1f (diff) | |
| parent | 911fd6c654435e60167007fd95a4e8ace50806e8 (diff) | |
| download | volse-hubzilla-b67397861c75e8da465d2a730b1e75b6bd0a72ee.tar.gz volse-hubzilla-b67397861c75e8da465d2a730b1e75b6bd0a72ee.tar.bz2 volse-hubzilla-b67397861c75e8da465d2a730b1e75b6bd0a72ee.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/include/text.php b/include/text.php index 11062a1b2..c30be77b8 100644 --- a/include/text.php +++ b/include/text.php @@ -1374,12 +1374,23 @@ function prepare_body(&$item,$attach = false) { $s = prepare_text($item['body'],$item['mimetype'], false); // } - $is_photo = (($item['obj_type'] === ACTIVITY_OBJ_PHOTO) ? true : false); + $photo = ''; + $is_photo = (($item['obj_type'] === ACTIVITY_OBJ_PHOTO) ? true : false); if($is_photo) { $object = json_decode($item['object'],true); - $photo = '<a href="' . zid(rawurldecode(get_rel_link($object['link'],'alternate'))) . '" target="_newwin"><img style="max-width:' . $object['width'] . 'px; width:100%; height:auto;" src="'. zid(rawurldecode($object['id'])) . '"></a>'; + + // if original photo width is <= 640px prepend it to item body + if($object['link'][0]['width'] && $object['link'][0]['width'] <= 640) { + $s = '<div class="inline-photo-item-wrapper"><a href="' . zid(rawurldecode($object['id'])) . '" target="_newwin"><img class="inline-photo-item" style="max-width:' . $object['link'][0]['width'] . 'px; width:100%; height:auto;" src="' . zid(rawurldecode($object['link'][0]['href'])) . '"></a></div>' . $s; + } + + // if original photo width is > 640px make it a cover photo + if($object['link'][0]['width'] && $object['link'][0]['width'] > 640) { + $scale = ((($object['link'][1]['width'] == 1024) || ($object['link'][1]['height'] == 1024)) ? 1 : 0); + $photo = '<a href="' . zid(rawurldecode($object['id'])) . '" target="_newwin"><img style="max-width:' . $object['link'][$scale]['width'] . 'px; width:100%; height:auto;" src="' . zid(rawurldecode($object['link'][$scale]['href'])) . '"></a>'; + } } $prep_arr = array( |