friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Limit smilies replacement to BBCode::convert

This commit is contained in:
Hypolite Petovan 2019-06-20 15:00:33 -04:00
parent 5e4ace271b
commit 9545ff614b
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/text.php
View File

@ -143,13 +143,9 @@ function redir_private_images($a, &$item)
* @return string Formattet HTML.
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
function prepare_text($text) {
if (stristr($text, '[nosmile]')) {
$s = BBCode::convert($text);
} else {
$s = Smilies::replace(BBCode::convert($text));
}
function prepare_text($text)
{
$s = BBCode::convert($text);
return trim($s);
}

2
mod/message.php
View File

@ -384,7 +384,7 @@ function message_content(App $a)
$from_name_e = $message['from-name'];
$subject_e = $message['title'];
$body_e = Smilies::replace(BBCode::convert($message['body']));
$body_e = BBCode::convert($message['body']);
$to_name_e = $message['name'];
$contact = Contact::getDetailsByURL($message['from-url']);

3
src/Content/Text/BBCode.php
View File

@ -1395,6 +1395,7 @@ class BBCode extends BaseObject
// This is actually executed in Item::prepareBody()
$nosmile = strpos($text, '[nosmile]') !== false;
$text = str_replace('[nosmile]', '', $text);
// Check for font change text
@ -1572,7 +1573,7 @@ class BBCode extends BaseObject
}
// Replace non graphical smilies for external posts
if ($simple_html) {
if (!$nosmile && !$for_plaintext) {
$text = Smilies::replace($text);
}