aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-02-02 14:56:17 +0000
committerThomas Willingham <founder@kakste.com>2013-02-02 14:56:17 +0000
commit0f13ae0ade10d6d2b0ef185ae6d6cc2d35831433 (patch)
tree7d6ac98d5f0b4e10ef86ba0f312401830c751250 /include/items.php
parent1633f95db8a004055e51d1580fa4394527ca8a91 (diff)
parent5c6c4395f4ab7924cad619d3a1ca4cee69219769 (diff)
downloadvolse-hubzilla-0f13ae0ade10d6d2b0ef185ae6d6cc2d35831433.tar.gz
volse-hubzilla-0f13ae0ade10d6d2b0ef185ae6d6cc2d35831433.tar.bz2
volse-hubzilla-0f13ae0ade10d6d2b0ef185ae6d6cc2d35831433.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/items.php')
-rwxr-xr-xinclude/items.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php
index 5afb0816d..7a00754e6 100755
--- a/include/items.php
+++ b/include/items.php
@@ -635,7 +635,7 @@ function decode_tags($t) {
$ret = array();
foreach($t as $x) {
$tag = array();
- $tag['term'] = htmlentities($x['term'], ENT_COMPAT,'UTF-8',false);
+ $tag['term'] = htmlentities($x['tag'], ENT_COMPAT,'UTF-8',false);
$tag['url'] = htmlentities($x['url'], ENT_COMPAT,'UTF-8',false);
switch($x['type']) {
case 'hashtag':