Merge pull request #7296 from MrPetovan/task/smilies-replace

Limit smilies replacement to BBCode::convert
2019-06-24 22:05:37 +02:00
parent 8214aa287d 2fb70bd5f2
commit 26accbe3ef
5 changed files with 13 additions and 12 deletions
--- a/tests/src/Content/Text/BBCodeTest.php
+++ b/tests/src/Content/Text/BBCodeTest.php
@@ -40,6 +40,9 @@ class BBCodeTest extends MockedTest
 		$this->configMock->shouldReceive('get')
 			->with('system', 'url')
 			->andReturn('friendica.local');
+		$this->configMock->shouldReceive('get')
+			->with('system', 'no_smilies')
+			->andReturn(false);
 		$this->mockL10nT();
 	}