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

Merge pull request #5823 from JoshyPHP/ticket/16309

Browse source 
[ticket/16309] Fix smilies with a left square bracket
This commit is contained in:
Marc Alexander 2020-01-09 20:37:05 +01:00
commit 531f5dd9da
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
4 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/composer.lock generated
View file

@ -337,7 +337,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",
@ -810,16 +810,16 @@
}, },
{ {
"name": "s9e/regexp-builder", "name": "s9e/regexp-builder",
"version": "1.4.3", "version": "1.4.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/s9e/RegexpBuilder.git", "url": "https://github.com/s9e/RegexpBuilder.git",
"reference": "59d0167a909659d718f53964f7653d2c83a5f8fe" "reference": "605b33841a766abd40ba3d07c15d0f62b5e7f033"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/s9e/RegexpBuilder/zipball/59d0167a909659d718f53964f7653d2c83a5f8fe", "url": "https://api.github.com/repos/s9e/RegexpBuilder/zipball/605b33841a766abd40ba3d07c15d0f62b5e7f033",
"reference": "59d0167a909659d718f53964f7653d2c83a5f8fe", "reference": "605b33841a766abd40ba3d07c15d0f62b5e7f033",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -827,7 +827,7 @@
"php": ">=5.5.1" "php": ">=5.5.1"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "<5.8" "phpunit/phpunit": "*"
}, },
"type": "library", "type": "library",
"autoload": { "autoload": {
@ -844,7 +844,7 @@
"keywords": [ "keywords": [
"regexp" "regexp"
], ],
"time": "2019-04-26T17:55:23+00:00" "time": "2020-01-08T02:46:22+00:00"
}, },
{ {
"name": "s9e/text-formatter", "name": "s9e/text-formatter",
@ -2218,6 +2218,7 @@
"code", "code",
"zf" "zf"
], ],
"abandoned": "laminas/laminas-code",
"time": "2019-12-10T19:21:15+00:00" "time": "2019-12-10T19:21:15+00:00"
}, },
{ {
@ -2272,6 +2273,7 @@
"events", "events",
"zf2" "zf2"
], ],
"abandoned": "laminas/laminas-eventmanager",
"time": "2018-04-25T15:33:34+00:00" "time": "2018-04-25T15:33:34+00:00"
} }
], ],

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

@ -0,0 +1 @@
<img class="smilies" src="phpBB/images/smilies/lol.png" width="17" height="17" alt="[lol]" title="lol">

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

@ -0,0 +1 @@
[lol]

23
tests/text_processing/tickets_data/PHPBB3-16309.xml Normal file
View file

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8" ?>
<dataset>
<table name="phpbb_smilies">
<column>smiley_id</column>
<column>code</column>
<column>emotion</column>
<column>smiley_url</column>
<column>smiley_width</column>
<column>smiley_height</column>
<column>smiley_order</column>
<column>display_on_posting</column>
<row>
<value>41</value>
<value>[lol]</value>
<value>lol</value>
<value>lol.png</value>
<value>17</value>
<value>17</value>
<value>41</value>
<value>1</value>
</row>
</table>
</dataset>