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:
Marc Alexander 2016-08-16 20:49:36 +02:00
commit 9dbe47ba8e
4 changed files with 49 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

@ -622,16 +622,16 @@
}, },
{ {
"name": "s9e/text-formatter", "name": "s9e/text-formatter",
"version": "0.6.1", "version": "0.6.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/s9e/TextFormatter.git", "url": "https://github.com/s9e/TextFormatter.git",
"reference": "dd0ec47d1ffb5ed5a3eb4e3adbc33db6e0057420" "reference": "99d6b5799387dddfdd00b5a76bb83a15dda586e3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/dd0ec47d1ffb5ed5a3eb4e3adbc33db6e0057420", "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/99d6b5799387dddfdd00b5a76bb83a15dda586e3",
"reference": "dd0ec47d1ffb5ed5a3eb4e3adbc33db6e0057420", "reference": "99d6b5799387dddfdd00b5a76bb83a15dda586e3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -678,7 +678,7 @@
"parser", "parser",
"shortcodes" "shortcodes"
], ],
"time": "2016-07-30 01:50:02" "time": "2016-08-09 14:16:45"
}, },
{ {
"name": "symfony/config", "name": "symfony/config",

2
tests/text_processing/tickets_data/PHPBB3-14740.html Normal file
View file

@ -0,0 +1,2 @@
<div id="modremark"><div id="modremarkexclamation">!</div><div><div id="moderemarktitle">Moderatoropmerking from: neufke</div><div id="moderemarktext">Mod Remark</div></div></div>
<div id="modremark"><div id="modremarkexclamation">!</div><div><div id="moderemarktitle">Moderatoropmerking from: neufke</div><div id="moderemarktext">Mod Remark</div></div></div>

2
tests/text_processing/tickets_data/PHPBB3-14740.txt Normal file
View file

@ -0,0 +1,2 @@
[mod=neufke]Mod Remark[/mod]
[mod="neufke"]Mod Remark[/mod]

40
tests/text_processing/tickets_data/PHPBB3-14740.xml Normal file
View file

@ -0,0 +1,40 @@
<?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=&quot;{TEXT1}&quot;]{TEXT2}[/mod]</value>
<value><![CDATA[<div id="modremark">
<div id="modremarkexclamation">!</div>
<div>
<div id="moderemarktitle">Moderatoropmerking {L_FROM}{L_COLON} {TEXT1}</div>
<div id="moderemarktext">{TEXT2}</div>
</div>
</div>]]></value>
<value>!\[mod\=&quot;(.*?)&quot;\](.*?)\[/mod\]!ies</value>
<value>'[mod=&quot;'.str_replace(array("\r\n", '\"', '\'', '(', ')'), array("\n", '"', '&#39;', '&#40;', '&#41;'), trim('${1}')).'&quot;:$uid]'.str_replace(array("\r\n", '\"', '\'', '(', ')'), array("\n", '"', '&#39;', '&#40;', '&#41;'), trim('${2}')).'[/mod:$uid]'</value>
<value>!\[mod\=&quot;(.*?)&quot;:$uid\](.*?)\[/mod:$uid\]!s</value>
<value><![CDATA[<div id="modremark">
<div id="modremarkexclamation">!</div>
<div>
<div id="moderemarktitle">Moderatoropmerking {L_FROM}{L_COLON} ${1}</div>
<div id="moderemarktext">${2}</div>
</div>
</div>]]></value>
</row>
</table>
</dataset>