mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 14:18:27 +01:00
Code Issues Projects Releases Wiki Activity

Fix: Richtext extension scan cuts title if title contains )

Browse Source
This commit is contained in:
buddh4 2020-11-30 18:08:43 +01:00
parent 5083c093f5
commit e6b81cd6d2
2 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
protected/humhub/modules/content/tests/codeception/unit/RichtextExtensionTest.php Normal file
View File

@ -0,0 +1,54 @@
<?php
namespace humhub\modules\content\tests\codeception\unit;
use humhub\modules\content\widgets\richtext\ProsemirrorRichText;
use tests\codeception\_support\HumHubDbTestCase;
class RichtextExtensionTest extends HumHubDbTestCase
{
public function testStripHtml()
{
$text = '[img3.jpg](http://humhub.com "img)3.jpg" xasdfjpös0as)
[test2.txt](file-guid:aef0eb95-b715-4707-9792-180e4395e681)
test
![img3.jpg](file-guid:3f1e14a2-4375-434a-a554-a19ec5e48909 "img))))3.jpg")asdfas
asdfasdfasdf
[test2.txt](file-guid:aef0eb95-b715-4707-9792-180e4395e681 "test")
asdfasdfasdf
[test2.txt](file-guid:aef0eb95-b715-4707-9792-180e4395e681)';
$matches = ProsemirrorRichText::scanLinkExtension($text, 'file-guid');
static::assertCount(4, $matches);
static::assertEquals('[test2.txt](file-guid:aef0eb95-b715-4707-9792-180e4395e681)', $matches[0][0]);
static::assertEquals('test2.txt', $matches[0][1]);
static::assertEquals('file-guid', $matches[0][2]);
static::assertEquals('aef0eb95-b715-4707-9792-180e4395e681', $matches[0][3]);
static::assertEquals('[img3.jpg](file-guid:3f1e14a2-4375-434a-a554-a19ec5e48909 "img))))3.jpg")', $matches[1][0]);
static::assertEquals('img3.jpg', $matches[1][1]);
static::assertEquals('file-guid', $matches[1][2]);
static::assertEquals('3f1e14a2-4375-434a-a554-a19ec5e48909', $matches[1][3]);
static::assertEquals('img))))3.jpg', $matches[1][4]);
static::assertEquals('[test2.txt](file-guid:aef0eb95-b715-4707-9792-180e4395e681 "test")', $matches[2][0]);
static::assertEquals('test2.txt', $matches[2][1]);
static::assertEquals('file-guid', $matches[2][2]);
static::assertEquals('aef0eb95-b715-4707-9792-180e4395e681', $matches[2][3]);
static::assertEquals('test', $matches[2][4]);
static::assertEquals('[test2.txt](file-guid:aef0eb95-b715-4707-9792-180e4395e681)', $matches[3][0]);
static::assertEquals('test2.txt', $matches[3][1]);
static::assertEquals('file-guid', $matches[3][2]);
static::assertEquals('aef0eb95-b715-4707-9792-180e4395e681', $matches[3][3]);
}
}

4
protected/humhub/modules/content/widgets/richtext/ProsemirrorRichText.php
View File

@ -292,10 +292,10 @@ class ProsemirrorRichText extends AbstractRichText
protected static function getLinkExtensionPattern($extension = '[a-zA-Z]+')
{
if($extension === null) {
$extension = '[a-zA-Z]+';
$extension = '[a-zA-Z-_]+';
}
return '/(?<!\\\\)\[([^\]]*)\]\(('.$extension.'):{1}([^\)\s]*)(?:\s")?([^")]*)?(?:")?[^\)]*\)/is';
return '/(?<!\\\\)\[([^\]]*)\]\(('.$extension.'):{1}([^\)\s]*)(?:\s)?(?:"([^"]*)")?[^\)]*\)/is';
}
/**