Merge pull request #4399 from MrPetovan/task/3878-move-include-bbcode-to-src

Move include/bbcode to src/ part 1 : Everything but bbcode()
This commit is contained in:
Tobias Diekershoff 2018-02-07 07:18:39 +01:00 committed by GitHub
commit 85c8bf0228
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 1615 additions and 1505 deletions

View file

@ -2751,7 +2751,7 @@ function api_get_entitities(&$text, $bbcode)
return [];
}
$bbcode = bb_CleanPictureLinks($bbcode);
$bbcode = BBCode::cleanPictureLinks($bbcode);
// Change pure links in text to bbcode uris
$bbcode = preg_replace("/([^\]\='".'"'."]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1[url=$2]$2[/url]', $bbcode);
@ -5171,7 +5171,7 @@ function api_clean_plain_items($Text)
{
$include_entities = strtolower(x($_REQUEST, 'include_entities') ? $_REQUEST['include_entities'] : "false");
$Text = bb_CleanPictureLinks($Text);
$Text = BBCode::cleanPictureLinks($Text);
$URLSearchString = "^\[\]";
$Text = preg_replace("/([!#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$1$3', $Text);