clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '2020.12-rc' into bug/9656-purify-video-embed

This commit is contained in:
Hypolite Petovan 2020-12-18 14:47:24 -05:00 committed by GitHub
parent 20d9dcf7ac c6bb405b07
commit bcd61c8372
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@ use Friendica\Util\XML;
class BBCode
{
// Update this value to the current date whenever changes are made to BBCode::convert
const VERSION = '2020-12-18';
const VERSION = '2020-12-18-video-embeds';
const INTERNAL = 0;
const API = 2;
@ -1467,7 +1467,7 @@ class BBCode
$text = preg_replace("(\[style=(.*?)\](.*?)\[\/style\])ism", '<span style="$1">$2</span>', $text);
// Check for CSS classes
$text = preg_replace("(\[class=(.*?)\](.*?)\[\/class\])ism", '<span style="$1">$2</span>', $text);
$text = preg_replace("(\[class=(.*?)\](.*?)\[\/class\])ism", '<span class="$1">$2</span>', $text);
// handle nested lists
$endlessloop = 0;

4
tests/src/Content/Text/BBCodeTest.php
View File

@ -277,6 +277,10 @@ class BBCodeTest extends MockedTest
'expectedHTML' => '<span style="color:#FFFFFF;">dare to move your mouse here</span>',
'text' => '[color=FFFFFF]dare to move your mouse here[/color]'
],
'bug-9639-span-classes' => [
'expectedHTML' => '<span class="arbitrary classes">Test</span>',
'text' => '[class=arbitrary classes]Test[/class]',
],
];
}