Toggle explicit mentions in comment boxes with explicit_mentions config
authorHypolite Petovan <hypolite@mrpetovan.com>
Sat, 9 Feb 2019 04:07:36 +0000 (23:07 -0500)
committerHypolite Petovan <hypolite@mrpetovan.com>
Sat, 9 Feb 2019 04:07:36 +0000 (23:07 -0500)
src/Object/Post.php

index 6e2483c..36451c8 100644 (file)
@@ -6,6 +6,7 @@ namespace Friendica\Object;
 
 use Friendica\BaseObject;
 use Friendica\Content\ContactSelector;
+use Friendica\Content\Feature;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
@@ -772,13 +773,18 @@ class Post extends BaseObject
         * Get default text for the comment box
         *
         * @return string
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        private function getDefaultText()
        {
                $a = self::getApp();
 
                if (!local_user() || empty($a->profile['addr'])) {
-                       return;
+                       return '';
+               }
+
+               if (!Feature::isEnabled(local_user(), 'explicit_mentions')) {
+                       return '';
                }
 
                $item = Item::selectFirst(['author-addr'], ['id' => $this->getId()]);