aboutsummaryrefslogtreecommitdiffstats
path: root/mod/item.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 /mod/item.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 'mod/item.php')
-rw-r--r--mod/item.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/mod/item.php b/mod/item.php
index 8d01a12f8..080413be9 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -434,7 +434,7 @@ function item_post(&$a) {
'uid' => $profile_uid,
'type' => $success['termtype'],
'otype' => TERM_OBJ_POST,
- 'term' => substr($tag,1),
+ 'term' => $success['term'],
'url' => $success['url']
);
}
@@ -853,7 +853,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
$str_tags .= ',';
$str_tags .= $newtag;
}
- return array('replaced' => $replaced, 'termtype' => $termtype, 'url' => $url, 'contact' => $r[0]);
+ return array('replaced' => $replaced, 'termtype' => $termtype, 'term' => $basetag, 'url' => $url, 'contact' => $r[0]);
}
//is it a person tag?
if(strpos($tag,'@') === 0) {
@@ -965,7 +965,7 @@ function handle_tag($a, &$body, &$inform, &$str_tags, $profile_uid, $tag) {
}
}
- return array('replaced' => $replaced, 'termtype' => $termtype, 'url' => $url, 'contact' => $r[0]);
+ return array('replaced' => $replaced, 'termtype' => $termtype, 'term' => $newname, 'url' => $url, 'contact' => $r[0]);
}