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

Fix group regexes that got missed in Nickname::DISPLAY_FMT update: fixes bug where group linking happened, but not actual delivery, when using _underscores_ in the !group_name

Browse Source
This commit is contained in:
Brion Vibber 2011-02-07 12:18:41 -08:00
parent 1d439ef5d8
commit 4883069177
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Notice.php
View File

@ -964,7 +964,7 @@ class Notice extends Memcached_DataObject
$groups = array(); $groups = array();
/* extract all !group */ /* extract all !group */
$count = preg_match_all('/(?:^|\s)!([A-Za-z0-9]{1,64})/', $count = preg_match_all('/(?:^|\s)!(' . Nickname::DISPLAY_FMT . ')/',
strtolower($this->content), strtolower($this->content),
$match); $match);
if (!$count) { if (!$count) {

4
plugins/GroupPrivateMessage/GroupPrivateMessagePlugin.php
View File

@ -391,8 +391,10 @@ class GroupPrivateMessagePlugin extends Plugin
// Look for group tags // Look for group tags
// FIXME: won't work for remote groups // FIXME: won't work for remote groups
// @fixme if Notice::saveNew is refactored so we can just pull its list
// of groups between processing and saving, make use of it
$count = preg_match_all('/(?:^|\s)!([A-Za-z0-9]{1,64})/', $count = preg_match_all('/(?:^|\s)!(' . Nickname::DISPLAY_FMT . ')/',
strtolower($notice->content), strtolower($notice->content),
$match); $match);