aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-07-06 23:30:20 +0200
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-07-06 23:30:20 +0200
commit193c6d58b0fe9bcc53065bff30ea3b28fb02308c (patch)
tree97620270d79de9f54468e616aea8333417a63667
parent25220f4886d62ac55e1c67f5b0ec15a7c9029b50 (diff)
parent57a07f4ff71d1513d1891ad8cca6c29c40dfa6b7 (diff)
downloadforums-193c6d58b0fe9bcc53065bff30ea3b28fb02308c.tar
forums-193c6d58b0fe9bcc53065bff30ea3b28fb02308c.tar.gz
forums-193c6d58b0fe9bcc53065bff30ea3b28fb02308c.tar.bz2
forums-193c6d58b0fe9bcc53065bff30ea3b28fb02308c.tar.xz
forums-193c6d58b0fe9bcc53065bff30ea3b28fb02308c.zip
Merge pull request #3743 from s9e/ticket/13985
[ticket/13985] Updated s9e\TextFormatter
-rw-r--r--phpBB/composer.lock8
-rw-r--r--tests/text_processing/tickets_data/PHPBB3-10989.html2
2 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/composer.lock b/phpBB/composer.lock
index 27dbc48321..cff4bd6289 100644
--- a/phpBB/composer.lock
+++ b/phpBB/composer.lock
@@ -220,12 +220,12 @@
"source": {
"type": "git",
"url": "https://github.com/s9e/TextFormatter.git",
- "reference": "85ac4557e7fc504e74ec0a672680af8481fe329c"
+ "reference": "326a5a0bbaee59a3d5542fc8e38fe41971931cce"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/85ac4557e7fc504e74ec0a672680af8481fe329c",
- "reference": "85ac4557e7fc504e74ec0a672680af8481fe329c",
+ "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/326a5a0bbaee59a3d5542fc8e38fe41971931cce",
+ "reference": "326a5a0bbaee59a3d5542fc8e38fe41971931cce",
"shasum": ""
},
"require": {
@@ -270,7 +270,7 @@
"parser",
"shortcodes"
],
- "time": "2015-06-13 12:25:49"
+ "time": "2015-07-05 23:13:46"
},
{
"name": "symfony/config",
diff --git a/tests/text_processing/tickets_data/PHPBB3-10989.html b/tests/text_processing/tickets_data/PHPBB3-10989.html
index f003ad3dfa..cd24df60e5 100644
--- a/tests/text_processing/tickets_data/PHPBB3-10989.html
+++ b/tests/text_processing/tickets_data/PHPBB3-10989.html
@@ -1,6 +1,6 @@
<blockquote><div><cite>Lorem wrote:</cite>[quote="Lorem"<blockquote class="uncited"><div> Suspendisse iaculis porta tempor. Nulla.</div></blockquote>
Nullam a tortor sit amet.</div></blockquote>
- Proin ac mi eget magna.
+ Proin ac mi eget magna.<br>
<blockquote><div><cite>Lorem wrote:</cite>Quisque fermentum tortor quis odio scelerisque consequat fermentum urna gravida. In semper vehicula condimentum. Donec suscipit ante imperdiet augue rhoncus.</div></blockquote>