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

Merge pull request #4380 from JoshyPHP/ticket/14706

Browse source 
[ticket/14706] Updated [list] BBCode to automatically create a list item
This commit is contained in:
Marc Alexander 2016-07-14 20:18:24 +02:00
commit ebdef04f5d
6 changed files with 12 additions and 10 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.2", "paragonie/random_compat": "^1.2",
"patchwork/utf8": "1.1.*", "patchwork/utf8": "1.1.*",
"s9e/text-formatter": "^0.4.2", "s9e/text-formatter": "^0.5.4",
"symfony/config": "2.8.*", "symfony/config": "2.8.*",
"symfony/console": "2.8.*", "symfony/console": "2.8.*",
"symfony/debug": "2.8.*", "symfony/debug": "2.8.*",

14
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": "0a51a3b7218cbf3a5fe6621729b72c05", "hash": "b0bb6560f0982ecfc8867e762faa3847",
"content-hash": "396082a59d972dd35293fe73b0615e79", "content-hash": "322b621681118fa67925d35030625dae",
"packages": [ "packages": [
{ {
"name": "bantu/ini-get-wrapper", "name": "bantu/ini-get-wrapper",
@ -647,16 +647,16 @@
}, },
{ {
"name": "s9e/text-formatter", "name": "s9e/text-formatter",
"version": "0.4.11", "version": "0.5.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/s9e/TextFormatter.git", "url": "https://github.com/s9e/TextFormatter.git",
"reference": "e6dc4615081b1668742076aa05d11aa0f7b00103" "reference": "e9363a0d2d6ddef40200854207557c648d36d925"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/s9e/TextFormatter/zipball/e6dc4615081b1668742076aa05d11aa0f7b00103", "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/e9363a0d2d6ddef40200854207557c648d36d925",
"reference": "e6dc4615081b1668742076aa05d11aa0f7b00103", "reference": "e9363a0d2d6ddef40200854207557c648d36d925",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -703,7 +703,7 @@
"parser", "parser",
"shortcodes" "shortcodes"
], ],
"time": "2016-02-21 20:38:42" "time": "2016-07-08 05:19:02"
}, },
{ {
"name": "symfony/config", "name": "symfony/config",

2
phpBB/phpbb/textformatter/s9e/factory.php
View file

@ -82,7 +82,7 @@ class factory implements \phpbb\textformatter\cache_interface
'flash' => '[FLASH={NUMBER1},{NUMBER2} width={NUMBER1;postFilter=#flashwidth} height={NUMBER2;postFilter=#flashheight} url={URL;useContent} /]', 'flash' => '[FLASH={NUMBER1},{NUMBER2} width={NUMBER1;postFilter=#flashwidth} height={NUMBER2;postFilter=#flashheight} url={URL;useContent} /]',
'i' => '[I]{TEXT}[/I]', 'i' => '[I]{TEXT}[/I]',
'img' => '[IMG src={IMAGEURL;useContent}]', 'img' => '[IMG src={IMAGEURL;useContent}]',
'list' => '[LIST type={HASHMAP=1:decimal,a:lower-alpha,A:upper-alpha,i:lower-roman,I:upper-roman;optional;postFilter=#simpletext}]{TEXT}[/LIST]', 'list' => '[LIST type={HASHMAP=1:decimal,a:lower-alpha,A:upper-alpha,i:lower-roman,I:upper-roman;optional;postFilter=#simpletext} #createChild=LI]{TEXT}[/LIST]',
'li' => '[* $tagName=LI]{TEXT}[/*]', 'li' => '[* $tagName=LI]{TEXT}[/*]',
'quote' => 'quote' =>
"[QUOTE "[QUOTE

2
tests/text_formatter/s9e/default_formatting_test.php
View file

@ -86,7 +86,7 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
), ),
array( array(
'[list]no item[/list]', '[list]no item[/list]',
'<ul>no item</ul>' '<ul><li>no item</li></ul>'
), ),
array( array(
'[*]unparsed', '[*]unparsed',

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

@ -0,0 +1 @@
<ul><li><ol style="list-style-type: lower-alpha"><li>a</li><li>b</li><li>c</li><li>d</li><li>e</li></ol></li><li>outer</li></ul>

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

@ -0,0 +1 @@
[list][list=a][*]a[*]b[*]c[*]d[*]e[/list][*]outer[/list]