makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '3.3.x'

Browse source
This commit is contained in:
Marc Alexander 2019-05-27 20:51:21 +02:00
commit 9a7885043b
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
4 changed files with 40 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
phpBB/composer.lock generated
View file

@ -819,7 +819,7 @@
"oauth", "oauth",
"security" "security"
], ],
"time": "2016-07-12T22:15:00+00:00" "time": "2018-02-14T22:37:14+00:00"
}, },
{ {
"name": "marc1706/fast-image-size", "name": "marc1706/fast-image-size",
@ -1038,7 +1038,7 @@
"pseudorandom", "pseudorandom",
"random" "random"
], ],
"time": "2017-03-13T16:22:52+00:00" "time": "2018-04-04T21:48:54+00:00"
}, },
{ {
"name": "patchwork/utf8", "name": "patchwork/utf8",
@ -1287,16 +1287,16 @@
}, },
{ {
"name": "s9e/text-formatter", "name": "s9e/text-formatter",
"version": "1.4.3", "version": "1.4.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/s9e/TextFormatter.git", "url": "https://github.com/s9e/TextFormatter.git",
"reference": "76138c98161b2a063ecb28f5a46f9212a04aad1a" "reference": "504d538593350150e50c9de0a48418bb0a48e540"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/76138c98161b2a063ecb28f5a46f9212a04aad1a", "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/504d538593350150e50c9de0a48418bb0a48e540",
"reference": "76138c98161b2a063ecb28f5a46f9212a04aad1a", "reference": "504d538593350150e50c9de0a48418bb0a48e540",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -1308,6 +1308,7 @@
"require-dev": { "require-dev": {
"matthiasmullie/minify": "*", "matthiasmullie/minify": "*",
"php-coveralls/php-coveralls": "*", "php-coveralls/php-coveralls": "*",
"phpunit/phpunit": "<6",
"s9e/regexp-builder": "1.*" "s9e/regexp-builder": "1.*"
}, },
"suggest": { "suggest": {
@ -1348,7 +1349,7 @@
"parser", "parser",
"shortcodes" "shortcodes"
], ],
"time": "2019-04-26T12:32:18+00:00" "time": "2019-05-15T00:08:12+00:00"
}, },
{ {
"name": "seld/jsonlint", "name": "seld/jsonlint",
@ -3139,7 +3140,8 @@
"authors": [ "authors": [
{ {
"name": "Michiel Rook", "name": "Michiel Rook",
"email": "mrook@php.net" "email": "mrook@php.net",
"role": "Lead"
}, },
{ {
"name": "Phing Community", "name": "Phing Community",

1
tests/text_processing/tickets_data/PHPBB3-16053.html Normal file
View file

@ -0,0 +1 @@
<a href="http://ea117.com" alt="Test">Test</a>

1
tests/text_processing/tickets_data/PHPBB3-16053.txt Normal file
View file

@ -0,0 +1 @@
[test=http://ea117.com]Test[/test]

28
tests/text_processing/tickets_data/PHPBB3-16053.xml Normal file
View file

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8" ?>
<dataset>
<table name="phpbb_bbcodes">
<column>bbcode_id</column>
<column>bbcode_tag</column>
<column>bbcode_helpline</column>
<column>display_on_posting</column>
<column>bbcode_match</column>
<column>bbcode_tpl</column>
<column>first_pass_match</column>
<column>first_pass_replace</column>
<column>second_pass_match</column>
<column>second_pass_replace</column>
<row>
<value>13</value>
<value>test</value>
<value></value>
<value>1</value>
<value>[test={URL}]{TEXT}[/test]</value>
<value><![CDATA[<a href="{URL}" alt="{TEXT}">{TEXT}</a>]]></value>
<value>((?!))</value>
<value></value>
<value>((?!))</value>
<value></value>
</row>
</table>
</dataset>