Merge branch 'master' into feature-3716/Messaging_inbox_outbox_user

This commit is contained in:
Paolo
2020-01-23 09:55:00 +01:00
817 changed files with 56 additions and 50 deletions
+2 -2
View File
@@ -107,7 +107,7 @@ class PhrasesLib
// If no <p> tags required
if ($blockTags == 'no')
{
$tmpText = $textileParser->textileThis($result->retval[$i]->text); // Parse
$tmpText = $textileParser->parse($result->retval[$i]->text); // Parse
// Removes tags <p> and </p> from the beginning and from the end of the string if they are present
// NOTE: Those tags are usually, but not always, added by the textile parser
@@ -127,7 +127,7 @@ class PhrasesLib
}
else
{
$result->retval[$i]->text = $textileParser->textileThis($result->retval[$i]->text);
$result->retval[$i]->text = $textileParser->parse($result->retval[$i]->text);
}
}
}