diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-06-17 13:54:38 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-06-17 13:54:38 +0200 |
| commit | a393a23a087797531eee6ae998ec2698a89b4fd7 (patch) | |
| tree | 59583a260000718427517f1f7e6d2ebf4766b40f | |
| parent | 7f50c269417c97f642ae6a0459014b68b72b693b (diff) | |
| parent | a563b616e018088bcd2dd2fe1d6ba90c698caa3f (diff) | |
| download | forums-a393a23a087797531eee6ae998ec2698a89b4fd7.tar forums-a393a23a087797531eee6ae998ec2698a89b4fd7.tar.gz forums-a393a23a087797531eee6ae998ec2698a89b4fd7.tar.bz2 forums-a393a23a087797531eee6ae998ec2698a89b4fd7.tar.xz forums-a393a23a087797531eee6ae998ec2698a89b4fd7.zip | |
Merge pull request #5616 from JoshyPHP/ticket/16074
[ticket/16074] Fix Twemoji URL for ZWJ sequences
| -rw-r--r-- | phpBB/composer.lock | 10 | ||||
| -rw-r--r-- | tests/text_processing/tickets_data/PHPBB3-16074.html | 1 | ||||
| -rw-r--r-- | tests/text_processing/tickets_data/PHPBB3-16074.txt | 1 |
3 files changed, 7 insertions, 5 deletions
diff --git a/phpBB/composer.lock b/phpBB/composer.lock index ea36d1ba8d..7d4f355e64 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -661,16 +661,16 @@ }, { "name": "s9e/text-formatter", - "version": "1.4.4", + "version": "1.4.5", "source": { "type": "git", "url": "https://github.com/s9e/TextFormatter.git", - "reference": "504d538593350150e50c9de0a48418bb0a48e540" + "reference": "6857c53658929b66dc0d92daece17f211c64ea61" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/504d538593350150e50c9de0a48418bb0a48e540", - "reference": "504d538593350150e50c9de0a48418bb0a48e540", + "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/6857c53658929b66dc0d92daece17f211c64ea61", + "reference": "6857c53658929b66dc0d92daece17f211c64ea61", "shasum": "" }, "require": { @@ -723,7 +723,7 @@ "parser", "shortcodes" ], - "time": "2019-05-15T00:08:12+00:00" + "time": "2019-06-04T15:47:55+00:00" }, { "name": "symfony/config", diff --git a/tests/text_processing/tickets_data/PHPBB3-16074.html b/tests/text_processing/tickets_data/PHPBB3-16074.html new file mode 100644 index 0000000000..b588e2ac47 --- /dev/null +++ b/tests/text_processing/tickets_data/PHPBB3-16074.html @@ -0,0 +1 @@ +<img alt=":man_judge:" class="emoji smilies" draggable="false" src="//twemoji.maxcdn.com/2/svg/1f468-200d-2696-fe0f.svg"> <img alt="👨⚖️" class="emoji smilies" draggable="false" src="//twemoji.maxcdn.com/2/svg/1f468-200d-2696-fe0f.svg">
\ No newline at end of file diff --git a/tests/text_processing/tickets_data/PHPBB3-16074.txt b/tests/text_processing/tickets_data/PHPBB3-16074.txt new file mode 100644 index 0000000000..f067a7294d --- /dev/null +++ b/tests/text_processing/tickets_data/PHPBB3-16074.txt @@ -0,0 +1 @@ +:man_judge: 👨⚖️
\ No newline at end of file |