forked from GNUsocial/gnu-social
move mention detection before default in OStatusPlugin
This commit is contained in:
parent
c79c70ea2c
commit
a0c255e231
@ -224,7 +224,7 @@ class OStatusPlugin extends Plugin
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
function onEndFindMentions($sender, $text, &$mentions)
|
function onStartFindMentions($sender, $text, &$mentions)
|
||||||
{
|
{
|
||||||
preg_match_all('/(?:^|\s+)@((?:\w+\.)*\w+@(?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+)/',
|
preg_match_all('/(?:^|\s+)@((?:\w+\.)*\w+@(?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+)/',
|
||||||
$text,
|
$text,
|
||||||
@ -471,7 +471,6 @@ class OStatusPlugin extends Plugin
|
|||||||
$oprofile->unsubscribe();
|
$oprofile->unsubscribe();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$member = Profile::staticGet($user->id);
|
$member = Profile::staticGet($user->id);
|
||||||
|
|
||||||
$act = new Activity();
|
$act = new Activity();
|
||||||
|
Loading…
Reference in New Issue
Block a user