diff options
| author | redmatrix <git@macgirvin.com> | 2016-02-26 12:49:02 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-02-26 12:49:02 -0800 |
| commit | 6126070a1d53c3ef4f59c8a0a6160610ef16563c (patch) | |
| tree | 2ffd507342edfa4db3ee516d6b7468597bef37cf /include/text.php | |
| parent | 459166116d926df23c73a839f3c87c2cfd2ba4ab (diff) | |
| parent | 776bc51172f5c21348c674a8bb6bf5037bde6815 (diff) | |
| download | volse-hubzilla-6126070a1d53c3ef4f59c8a0a6160610ef16563c.tar.gz volse-hubzilla-6126070a1d53c3ef4f59c8a0a6160610ef16563c.tar.bz2 volse-hubzilla-6126070a1d53c3ef4f59c8a0a6160610ef16563c.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'include/text.php')
| -rw-r--r-- | include/text.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/text.php b/include/text.php index 6b074d390..621f4cf93 100644 --- a/include/text.php +++ b/include/text.php @@ -1444,7 +1444,7 @@ function prepare_body(&$item,$attach = false) { call_hooks('prepare_body_init', $item); - + $s = ''; $photo = ''; $is_photo = ((($item['verb'] === ACTIVITY_POST) && ($item['obj_type'] === ACTIVITY_OBJ_PHOTO)) ? true : false); @@ -1454,7 +1454,7 @@ function prepare_body(&$item,$attach = false) { // 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="_blank"><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; + $s .= '<div class="inline-photo-item-wrapper"><a href="' . zid(rawurldecode($object['id'])) . '" target="_blank"><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 @@ -1464,7 +1464,7 @@ function prepare_body(&$item,$attach = false) { } } - $s = prepare_text($item['body'],$item['mimetype'], false); + $s .= prepare_text($item['body'],$item['mimetype'], false); $event = (($item['obj_type'] === ACTIVITY_OBJ_EVENT) ? format_event($item['object']) : false); |