1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 19:24:01 +02:00

Merge pull request #3623 from s9e/ticket/10620

[ticket/10620] Quote improvements
This commit is contained in:
Tristan Darricau
2015-07-07 09:46:36 +02:00
20 changed files with 381 additions and 49 deletions

View File

@@ -229,13 +229,40 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case
'<blockquote><div><cite><a href="http://example.org" class="postlink">http://example.org</a> wrote:</cite>...</div></blockquote>'
),
array(
'[quote="http://example.org"]...[/quote]',
'[quote=http://example.org]...[/quote]',
'<blockquote><div><cite><a href="http://example.org" class="postlink">http://example.org</a> wrote:</cite>...</div></blockquote>'
),
array(
"[quote]\nThis is a long quote that is definitely going to exceed 80 characters\n[/quote]\n\nFollowed by a reply",
"<blockquote class=\"uncited\"><div>\nThis is a long quote that is definitely going to exceed 80 characters\n</div></blockquote>\n\nFollowed by a reply"
),
array(
'[quote=Username post_id=123]...[/quote]',
'<blockquote><div><cite>Username wrote: <a href="phpBB/viewtopic.php?p=123#p123" data-post-id="123" onclick="if(document.getElementById(hash.substr(1)))href=hash">↑</a></cite>...</div></blockquote>'
),
array(
// Users are not allowed to submit their own URL for the post
'[quote="Username" post_url="http://fake.example.org"]...[/quote]',
'<blockquote><div><cite>Username wrote:</cite>...</div></blockquote>'
),
array(
'[quote=Username time=58705871]...[/quote]',
'<blockquote><div><cite>Username wrote:<div class="responsive-hide">1971-11-11 11:11:11</div></cite>...</div></blockquote>'
),
array(
'[quote=Username user_id=123]...[/quote]',
'<blockquote><div><cite><a href="phpBB/memberlist.php?mode=viewprofile&amp;u=123">Username</a> wrote:</cite>...</div></blockquote>'
),
array(
// Users are not allowed to submit their own URL for the profile
'[quote=Username profile_url=http://fake.example.org]...[/quote]',
'<blockquote><div><cite>Username wrote:</cite>...</div></blockquote>'
),
array(
// From phpbb_textformatter_s9e_utils_test::test_generate_quote()
'[quote=\'[quote="foo"]\']...[/quote]',
'<blockquote><div><cite>[quote="foo"] wrote:</cite>...</div></blockquote>'
),
);
}
}

View File

@@ -98,11 +98,15 @@ class phpbb_textformatter_s9e_utils_test extends phpbb_test_case
array('foo')
),
array(
'[quote="foo"]..[/quote] [quote="bar"]..[/quote]',
'[quote=foo]..[/quote] [quote]..[/quote]',
array('foo')
),
array(
'[quote=foo]..[/quote] [quote=bar]..[/quote]',
array('foo', 'bar')
),
array(
'[quote="foo"].[quote="baz"]..[/quote].[/quote] [quote="bar"]..[/quote]',
'[quote=foo].[quote=baz]..[/quote].[/quote] [quote=bar]..[/quote]',
array('foo', 'bar')
),
);
@@ -169,7 +173,37 @@ class phpbb_textformatter_s9e_utils_test extends phpbb_test_case
'post_id' => 123,
'url' => 'http://example.org'
),
'[quote="user" post_id="123" url="http://example.org"]...[/quote]',
'[quote=user post_id=123 url=http://example.org]...[/quote]',
),
array(
'...',
array('author' => ' '),
'[quote=" "]...[/quote]',
),
array(
'...',
array('author' => 'foo bar'),
'[quote="foo bar"]...[/quote]',
),
array(
'...',
array('author' => '\\'),
'[quote="\\\\"]...[/quote]',
),
array(
'...',
array('author' => '[quote="foo"]'),
'[quote=\'[quote="foo"]\']...[/quote]',
),
array(
'...',
array('author' => '""'),
'[quote=\'""\']...[/quote]',
),
array(
'...',
array('author' => "''"),
'[quote="\'\'"]...[/quote]',
),
array(
'This is a long quote that is definitely going to exceed 80 characters',