eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

default to #addtag on !group mention

This commit is contained in:
Mikael Nordfeldth 2017-05-02 21:12:17 +02:00
parent 07458e5375
commit 000af6d9ee
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
classes/Notice.php
View File

@ -1583,12 +1583,12 @@ class Notice extends Managed_DataObject
if (common_config('group', 'addtag')) { if (common_config('group', 'addtag')) {
// we automatically add a tag for every group name, too // we automatically add a tag for every group name, too
common_debug('Adding hashtag matching group nickname: '._ve($group->getNickname()));
$tag = Notice_tag::pkeyGet(array('tag' => common_canonical_tag($group->nickname), $tag = Notice_tag::pkeyGet(array('tag' => common_canonical_tag($group->getNickname()),
'notice_id' => $this->id)); 'notice_id' => $this->getID()));
if (is_null($tag)) { if (is_null($tag)) {
$this->saveTag($group->nickname); $this->saveTag($group->getNickname());
} }
} }

2
lib/default.php
View File

@ -297,7 +297,7 @@ $default =
'group' => 'group' =>
array('maxaliases' => 3, array('maxaliases' => 3,
'desclimit' => null, 'desclimit' => null,
'addtag' => false), 'addtag' => true),
'peopletag' => 'peopletag' =>
array('maxtags' => 100, // maximum number of tags a user can create. array('maxtags' => 100, // maximum number of tags a user can create.
'maxpeople' => 500, // maximum no. of people with the same tag by the same user 'maxpeople' => 500, // maximum no. of people with the same tag by the same user