diff options
| author | Andrew Manning <tamanning@zoho.com> | 2015-11-20 21:57:10 -0500 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2015-11-20 21:57:10 -0500 |
| commit | fee85030933bd15788bde7c0e019803a27a55f84 (patch) | |
| tree | a2755c3dbd77b3210f2420a162a28030e3fc2865 /include/text.php | |
| parent | 6083cd255990c82380a85029b3951160eb558ac9 (diff) | |
| parent | fabf7081d39481bb22ee27c4beaf96e5529168eb (diff) | |
| download | volse-hubzilla-fee85030933bd15788bde7c0e019803a27a55f84.tar.gz volse-hubzilla-fee85030933bd15788bde7c0e019803a27a55f84.tar.bz2 volse-hubzilla-fee85030933bd15788bde7c0e019803a27a55f84.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla into url-selected
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 4053c15b2..eb9171b40 100644 --- a/include/text.php +++ b/include/text.php @@ -1298,7 +1298,7 @@ function format_categories(&$item,$writeable) { function format_hashtags(&$item) { $s = ''; - $terms = get_terms_oftype($item['term'], TERM_HASHTAG); + $terms = get_terms_oftype($item['term'], array(TERM_HASHTAG,TERM_COMMUNITYTAG)); if($terms) { foreach($terms as $t) { $term = htmlspecialchars($t['term'], ENT_COMPAT, 'UTF-8', false) ; @@ -1403,13 +1403,13 @@ 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="_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; + $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 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>'; + $photo = '<a href="' . zid(rawurldecode($object['id'])) . '" target="_blank"><img style="max-width:' . $object['link'][$scale]['width'] . 'px; width:100%; height:auto;" src="' . zid(rawurldecode($object['link'][$scale]['href'])) . '"></a>'; } } |