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

[ticket/13921] Fix block BBCodes inside of inline BBCodes

Browse source 
PHPBB3-13921
This commit is contained in:
JoshyPHP 2015-06-13 14:27:12 +02:00
parent a49bd38e83
commit eb11c80b23
4 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/composer.lock generated
View file

@ -220,12 +220,12 @@
"source": {
"type": "git",
"url": "https://github.com/s9e/TextFormatter.git",
"reference": "4c124782e8f74cc462c4f27e81f81192b2853408"
"reference": "85ac4557e7fc504e74ec0a672680af8481fe329c"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/4c124782e8f74cc462c4f27e81f81192b2853408",
"reference": "4c124782e8f74cc462c4f27e81f81192b2853408",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/85ac4557e7fc504e74ec0a672680af8481fe329c",
"reference": "85ac4557e7fc504e74ec0a672680af8481fe329c",
"shasum": ""
},
"require": {
@ -270,7 +270,7 @@
"parser",
"shortcodes"
],
"time": "2015-05-30 02:58:41"
"time": "2015-06-13 12:25:49"
},
{
"name": "symfony/config",

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

@ -0,0 +1 @@
<span style="font-size: 200%; line-height: normal"></span><div style="text-align:center"><span style="font-size: 200%; line-height: normal">xxx</span></div>

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

@ -0,0 +1 @@
[size=200][center]xxx[/center][/size]

28
tests/text_processing/tickets_data/PHPBB3-13921.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>center</value>
<value></value>
<value>1</value>
<value>[center]{TEXT}[/center]</value>
<value><![CDATA[<div style="text-align:center">{TEXT}</div>]]></value>
<value>!\[center\](.*?)\[/center\]!ies</value>
<value>'[center:$uid]'.str_replace(array("\r\n", '\"', '\'', '(', ')'), array("\n", '"', '&#39;', '&#40;', '&#41;'), trim('${1}')).'[/center:$uid]'</value>
<value>!\[center:$uid\](.*?)\[/center:$uid\]!s</value>
<value><![CDATA[<div style="text-align:center">${1}</div>]]></value>
</row>
</table>
</dataset>