From 000af6d9ee6900f9b52069aaa8121f0583cb082d Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Tue, 2 May 2017 21:12:17 +0200
Subject: [PATCH] default to #addtag on !group mention

---
 classes/Notice.php | 8 ++++----
 lib/default.php    | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/classes/Notice.php b/classes/Notice.php
index bfe9f1c7f6..a5bd4451ec 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1583,12 +1583,12 @@ class Notice extends Managed_DataObject
 
                 if (common_config('group', 'addtag')) {
                     // we automatically add a tag for every group name, too
-
-                    $tag = Notice_tag::pkeyGet(array('tag' => common_canonical_tag($group->nickname),
-                                                     'notice_id' => $this->id));
+                    common_debug('Adding hashtag matching group nickname: '._ve($group->getNickname()));
+                    $tag = Notice_tag::pkeyGet(array('tag' => common_canonical_tag($group->getNickname()),
+                                                     'notice_id' => $this->getID()));
 
                     if (is_null($tag)) {
-                        $this->saveTag($group->nickname);
+                        $this->saveTag($group->getNickname());
                     }
                 }
 
diff --git a/lib/default.php b/lib/default.php
index 83dc58f898..90bca32c4f 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -297,7 +297,7 @@ $default =
         'group' =>
         array('maxaliases' => 3,
               'desclimit' => null,
-              'addtag' => false),
+              'addtag' => true),
         'peopletag' =>
         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
-- 
2.39.5