aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2015-10-28 15:03:34 +0100
committerMario Vavti <mario@mariovavti.com>2015-10-28 15:03:34 +0100
commit59da3dfe030493dcb8511cc3c06d672d61e5ea48 (patch)
tree45301bff27bb5bcc64ad3aeb9f0d6a70203bfbe2
parent4369ee2ca71dfa0c868dfb89476d5263cf848138 (diff)
downloadvolse-hubzilla-59da3dfe030493dcb8511cc3c06d672d61e5ea48.tar.gz
volse-hubzilla-59da3dfe030493dcb8511cc3c06d672d61e5ea48.tar.bz2
volse-hubzilla-59da3dfe030493dcb8511cc3c06d672d61e5ea48.zip
do not treat profile photo change posts like photo-items
-rw-r--r--include/text.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/text.php b/include/text.php
index c3abaeedf..e0c8d018e 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1446,11 +1446,15 @@ function prepare_body(&$item,$attach = false) {
unobscure($item);
+ $s = '';
+
$is_photo = (($item['obj_type'] === ACTIVITY_OBJ_PHOTO) ? true : false);
if($is_photo) {
$object = json_decode($item['object'],true);
- $scale = ((($object['link'][1]['width'] == 1024) || ($object['link'][1]['height'] == 1024)) ? 1 : 0);
- $s = '<div class="inline-photo-item-wrapper"><a href="' . zid(rawurldecode($object['id'])) . '"><img class="inline-photo-item" style="max-width:' . $object['link'][$scale]['width'] . 'px; width:100%; height:auto;" src="' . zid(rawurldecode($object['link'][$scale]['href'])) . '"></a></div>';
+ if($object['link'][0]['width']) {
+ $scale = ((($object['link'][1]['width'] == 1024) || ($object['link'][1]['height'] == 1024)) ? 1 : 0);
+ $s = '<div class="inline-photo-item-wrapper"><a href="' . zid(rawurldecode($object['id'])) . '"><img class="inline-photo-item" style="max-width:' . $object['link'][$scale]['width'] . 'px; width:100%; height:auto;" src="' . zid(rawurldecode($object['link'][$scale]['href'])) . '"></a></div>';
+ }
}
$s .= prepare_text($item['body'],$item['mimetype']);