diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-27 11:24:02 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-27 11:24:02 +0100 |
| commit | cf5383fdbe273af6b3858e216b313124fd125cf6 (patch) | |
| tree | a220d55b6624c76421a6173aec785958103aa92a /include/text.php | |
| parent | 21f2df399d3e21b6322ece16717efe88bcc21621 (diff) | |
| parent | 6126070a1d53c3ef4f59c8a0a6160610ef16563c (diff) | |
| download | volse-hubzilla-cf5383fdbe273af6b3858e216b313124fd125cf6.tar.gz volse-hubzilla-cf5383fdbe273af6b3858e216b313124fd125cf6.tar.bz2 volse-hubzilla-cf5383fdbe273af6b3858e216b313124fd125cf6.zip | |
Merge remote-tracking branch 'upstream/master'
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); |