aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-10-25 14:26:35 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-10-25 14:26:35 -0700
commit4369ee2ca71dfa0c868dfb89476d5263cf848138 (patch)
tree31401a5c25b6a33c11abb43fc4e42ea4bd8ccb1a
parenta1163b70a6daf2f29eef4af8a4c97ceaaf96aa99 (diff)
parent4442da306a6a2ac88c6dd0ab10b21616fb66daf0 (diff)
downloadvolse-hubzilla-4369ee2ca71dfa0c868dfb89476d5263cf848138.tar.gz
volse-hubzilla-4369ee2ca71dfa0c868dfb89476d5263cf848138.tar.bz2
volse-hubzilla-4369ee2ca71dfa0c868dfb89476d5263cf848138.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
-rw-r--r--include/ItemObject.php1
-rw-r--r--include/text.php10
2 files changed, 10 insertions, 1 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php
index d5601edf5..dea2f75bf 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -263,6 +263,7 @@ class Item extends BaseObject {
localize_item($item);
+
$body = prepare_body($item,true);
// $viewthread (below) is only valid in list mode. If this is a channel page, build the thread viewing link
diff --git a/include/text.php b/include/text.php
index f4122845e..c3abaeedf 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1440,12 +1440,20 @@ function generate_named_map($location) {
function prepare_body(&$item,$attach = false) {
+ require_once('include/identity.php');
call_hooks('prepare_body_init', $item);
unobscure($item);
- $s = prepare_text($item['body'],$item['mimetype']);
+ $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>';
+ }
+
+ $s .= prepare_text($item['body'],$item['mimetype']);
$prep_arr = array('item' => $item, 'html' => $s);
call_hooks('prepare_body', $prep_arr);