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

Merge branch '3.2.x'

Browse source
This commit is contained in:
Máté Bartus 2016-11-02 10:02:09 +01:00
commit 65d09b1dce
4 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/composer.lock generated
View file

@ -640,16 +640,16 @@
}, },
{ {
"name": "s9e/text-formatter", "name": "s9e/text-formatter",
"version": "0.8.1", "version": "0.8.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/s9e/TextFormatter.git", "url": "https://github.com/s9e/TextFormatter.git",
"reference": "93f0bc0a1ad829b90b5482c3d2bfc35ee4cfaacf" "reference": "34668fccbe259fbca0331e7a34409c4502ee71bd"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/93f0bc0a1ad829b90b5482c3d2bfc35ee4cfaacf", "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/34668fccbe259fbca0331e7a34409c4502ee71bd",
"reference": "93f0bc0a1ad829b90b5482c3d2bfc35ee4cfaacf", "reference": "34668fccbe259fbca0331e7a34409c4502ee71bd",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -696,7 +696,7 @@
"parser", "parser",
"shortcodes" "shortcodes"
], ],
"time": "2016-10-09 23:40:32" "time": "2016-11-02 08:14:58"
}, },
{ {
"name": "symfony/config", "name": "symfony/config",

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

@ -0,0 +1 @@
<div style="padding: .2em .5em; font-size: .8em; width: 200px; background: #FFD;">moderator text<div style="font-weight: bold; text-align: right">- Mickroz</div></div>

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

@ -0,0 +1 @@
[mod=Mickroz]moderator text[/mod]

28
tests/text_processing/tickets_data/PHPBB3-14846.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>mod=</value>
<value></value>
<value>1</value>
<value>[mod={TEXT1}]{TEXT2}[/mod]</value>
<value><![CDATA[<div style="padding: .2em .5em; font-size: .8em; width: 200px; background: #FFD;">{TEXT2}<div style="font-weight: bold; text-align: right">- {TEXT1}</div></div>]]></value>
<value><![CDATA[!\[mod\=(.*?)\](.*?)\[/mod\]!ies]]></value>
<value><![CDATA['[mod='.str_replace(array("\r\n", '\"', '\'', '(', ')'), array("\n", '"', '&#39;', '&#40;', '&#41;'), trim('${1}')).':$uid]'.str_replace(array("\r\n", '\"', '\'', '(', ')'), array("\n", '"', '&#39;', '&#40;', '&#41;'), trim('${2}')).'[/mod:$uid]']]></value>
<value><![CDATA[!\[mod\=(.*?):$uid\](.*?)\[/mod:$uid\]!s]]></value>
<value><![CDATA[<div style="padding: .2em .5em; font-size: .8em; width: 200px; background: #FFD;">${2}<div style="font-weight: bold; text-align: right">- ${1}</div></div>]]></value>
</row>
</table>
</dataset>