From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sat, 9 Feb 2019 04:07:36 +0000 (-0500)
Subject: Toggle explicit mentions in comment boxes with explicit_mentions config
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=9887f2c3d097208680d759388660d1fbfbeebb96;p=friendica.git

Toggle explicit mentions in comment boxes with explicit_mentions config
---

diff --git a/src/Object/Post.php b/src/Object/Post.php
index 6e2483c6a0..36451c854f 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -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()]);