GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'people_tags_rebase' into 1.0.x

Browse Source 
Conflicts:
	EVENTS.txt
This commit is contained in:
Zach Copley
2011-04-10 08:10:01 +00:00
parent 396005ecf6 fc21e5c76b
commit e75c9988eb
101 changed files with 11585 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/util.php
View File

@@ -754,17 +754,19 @@ function common_find_mentions($text, $notice)
foreach ($hmatches[1] as $hmatch) {
$tag = common_canonical_tag($hmatch[0]);
$plist = Profile_list::getByTaggerAndTag($sender->id, $tag);
if (!empty($plist) && !$plist->private) {
$tagged = $sender->getTaggedSubscribers($tag);
$tagged = Profile_tag::getTagged($sender->id, $tag);
$url = common_local_url('showprofiletag',
array('tagger' => $sender->nickname,
'tag' => $tag));
$url = common_local_url('subscriptions',
array('nickname' => $sender->nickname,
'tag' => $tag));
$mentions[] = array('mentioned' => $tagged,
'text' => $hmatch[0],
'position' => $hmatch[1],
'url' => $url);
$mentions[] = array('mentioned' => $tagged,
'text' => $hmatch[0],
'position' => $hmatch[1],
'url' => $url);
}
}
Event::handle('EndFindMentions', array($sender, $text, &$mentions));