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

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2017-01-15 14:06:13 +01:00
commit 7973984821
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
5 changed files with 58 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/composer.json
View file

@ -33,7 +33,7 @@
"marc1706/fast-image-size": "^1.1", "marc1706/fast-image-size": "^1.1",
"paragonie/random_compat": "^1.4", "paragonie/random_compat": "^1.4",
"patchwork/utf8": "^1.1", "patchwork/utf8": "^1.1",
"s9e/text-formatter": "~0.8.0", "s9e/text-formatter": "~0.9.0",
"symfony/config": "~3.1", "symfony/config": "~3.1",
"symfony/console": "~3.1", "symfony/console": "~3.1",
"symfony/debug": "~3.1", "symfony/debug": "~3.1",

19
phpBB/composer.lock generated
View file

@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"hash": "71da80ba275535787acd4570ccc0627c", "hash": "8541642eb4b706f15c466e0dd547a7fa",
"content-hash": "3de4cd17b0e17d6e273ef2b6e16631ad", "content-hash": "68fd1a0bc57151f27948642c75b08114",
"packages": [ "packages": [
{ {
"name": "bantu/ini-get-wrapper", "name": "bantu/ini-get-wrapper",
@ -640,16 +640,16 @@
}, },
{ {
"name": "s9e/text-formatter", "name": "s9e/text-formatter",
"version": "0.8.4", "version": "0.9.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/s9e/TextFormatter.git", "url": "https://github.com/s9e/TextFormatter.git",
"reference": "919fd772aae4dd889618da1cb18ae746f2a14bb6" "reference": "9dc4227779f8a753dbf0c4f8cb129320522d325c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/919fd772aae4dd889618da1cb18ae746f2a14bb6", "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/9dc4227779f8a753dbf0c4f8cb129320522d325c",
"reference": "919fd772aae4dd889618da1cb18ae746f2a14bb6", "reference": "9dc4227779f8a753dbf0c4f8cb129320522d325c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -658,6 +658,11 @@
"lib-pcre": ">=7.2", "lib-pcre": ">=7.2",
"php": ">=5.3.3" "php": ">=5.3.3"
}, },
"require-dev": {
"matthiasmullie/minify": "*",
"php": ">=5.3.3",
"s9e/regexp-builder": ">=1.3.0"
},
"suggest": { "suggest": {
"ext-curl": "Improves the performance of the MediaEmbed plugin and some JavaScript minifiers", "ext-curl": "Improves the performance of the MediaEmbed plugin and some JavaScript minifiers",
"ext-intl": "Allows international URLs to be accepted by the URL filter", "ext-intl": "Allows international URLs to be accepted by the URL filter",
@ -696,7 +701,7 @@
"parser", "parser",
"shortcodes" "shortcodes"
], ],
"time": "2016-11-22 20:10:24" "time": "2017-01-15 10:15:45"
}, },
{ {
"name": "symfony/config", "name": "symfony/config",

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

@ -0,0 +1 @@
<img class="smilies" src="phpBB/images/smilies/icon_lol.gif" width="15" height="17" alt=")--(" title=")--("> <img class="smilies" src="phpBB/images/smilies/icon_lol.gif" width="15" height="17" alt=")-(" title=")-("> <img class="smilies" src="phpBB/images/smilies/icon_lol.gif" width="15" height="17" alt=")--" title=")--">

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

@ -0,0 +1 @@
)--( )-( )--

43
tests/text_processing/tickets_data/PHPBB3-15016.xml Normal file
View file

@ -0,0 +1,43 @@
<?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>1</value>
<value>)--(</value>
<value>)--(</value>
<value>icon_lol.gif</value>
<value>15</value>
<value>17</value>
<value>22</value>
<value>1</value>
</row>
<row>
<value>2</value>
<value>)--</value>
<value>)--</value>
<value>icon_lol.gif</value>
<value>15</value>
<value>17</value>
<value>22</value>
<value>1</value>
</row>
<row>
<value>3</value>
<value>)-(</value>
<value>)-(</value>
<value>icon_lol.gif</value>
<value>15</value>
<value>17</value>
<value>22</value>
<value>1</value>
</row>
</table>
</dataset>