aboutsummaryrefslogtreecommitdiffstats
path: root/mod/item.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-13 18:07:49 -0800
committerfriendica <info@friendica.com>2015-01-13 18:07:49 -0800
commit111bbe65d9f671f598b68da63d74555d68973358 (patch)
treebb081ac8acd5a3245e7022f64589bbf5d3c0180b /mod/item.php
parente528483d8150b1495e96de5309ed383a5fd6e09b (diff)
parent47a2668b30de34f1f08983ba485a630a89a9dd1e (diff)
downloadvolse-hubzilla-111bbe65d9f671f598b68da63d74555d68973358.tar.gz
volse-hubzilla-111bbe65d9f671f598b68da63d74555d68973358.tar.bz2
volse-hubzilla-111bbe65d9f671f598b68da63d74555d68973358.zip
Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretagging
Conflicts: mod/profiles.php
Diffstat (limited to 'mod/item.php')
-rw-r--r--mod/item.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/item.php b/mod/item.php
index 7a14a8ae9..e1855732e 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -576,7 +576,7 @@ function item_post(&$a) {
// Look for tags and linkify them
- $results = linkify_tags($a, $body, $uid, $profile_uid);
+ $results = linkify_tags($a, $body, ($uid) ? $uid : $profile_uid);
// Set permissions based on tag replacements
set_linkified_perms($results, $str_contact_allow, $str_group_allow, $profile_uid, $parent_item);