aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/taxonomy.php8
-rwxr-xr-xinclude/text.php14
2 files changed, 20 insertions, 2 deletions
diff --git a/include/taxonomy.php b/include/taxonomy.php
index 5130ff9b7..aadcd938f 100644
--- a/include/taxonomy.php
+++ b/include/taxonomy.php
@@ -83,9 +83,13 @@ function format_term_for_display($term) {
$s .= '#';
elseif($term['type'] == TERM_MENTION)
$s .= '@';
+ else
+ return $s;
- if($term['url']) $s .= '<a target="extlink" href="' . $term['url'] . '">' . htmlspecialchars($term['term']) . '</a>';
- else $s .= htmlspecialchars($term['term']);
+ if($term['url'])
+ $s .= '<a href="' . $term['url'] . '">' . htmlspecialchars($term['term']) . '</a>';
+ else
+ $s .= htmlspecialchars($term['term']);
return $s;
}
diff --git a/include/text.php b/include/text.php
index afe2490e7..9a20625a6 100755
--- a/include/text.php
+++ b/include/text.php
@@ -1025,6 +1025,20 @@ function prepare_body($item,$attach = false) {
$s .= '<div class="clear"></div></div>';
}
+ if(is_array($item['term']) && count($item['term'])) {
+ $tstr = '';
+ foreach($item['term'] as $t) {
+ $t1 = format_term_for_display($t);
+ if($t1) {
+ if($tstr)
+ $tstr .= ' ';
+ $tstr .= $t1;
+ }
+ }
+ if($tstr)
+ $s .= '<br /><div class="posttags">' . $tstr . '</div>';
+ }
+
$writeable = ((get_observer_hash() == $item['owner_xchan']) ? true : false);
$x = '';