diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-07-13 23:03:44 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-07-13 23:03:44 +0200 |
| commit | da0897323b9b5b9e1e376dc3d1c9fe7024568781 (patch) | |
| tree | 0c7e5ffa41dc02930df342c5c87a3786d8c4c9a2 | |
| parent | 58d1d37c167c978257c9a4680d56835c63202738 (diff) | |
| parent | 675cf5e897944318f9666b088a5053f339fe1032 (diff) | |
| download | forums-da0897323b9b5b9e1e376dc3d1c9fe7024568781.tar forums-da0897323b9b5b9e1e376dc3d1c9fe7024568781.tar.gz forums-da0897323b9b5b9e1e376dc3d1c9fe7024568781.tar.bz2 forums-da0897323b9b5b9e1e376dc3d1c9fe7024568781.tar.xz forums-da0897323b9b5b9e1e376dc3d1c9fe7024568781.zip | |
Merge pull request #3758 from s9e/ticket/14008
[ticket/14008] Do not add a user_id value to quotes from guests
| -rw-r--r-- | phpBB/phpbb/textformatter/s9e/utils.php | 6 | ||||
| -rw-r--r-- | tests/text_formatter/s9e/utils_test.php | 9 |
2 files changed, 15 insertions, 0 deletions
diff --git a/phpBB/phpbb/textformatter/s9e/utils.php b/phpBB/phpbb/textformatter/s9e/utils.php index 40479b3423..b317fe4a8d 100644 --- a/phpBB/phpbb/textformatter/s9e/utils.php +++ b/phpBB/phpbb/textformatter/s9e/utils.php @@ -70,6 +70,12 @@ class utils implements \phpbb\textformatter\utils_interface $quote .= '=' . $this->format_attribute_value($attributes['author']); unset($attributes['author']); } + + if (isset($attributes['user_id']) && $attributes['user_id'] == ANONYMOUS) + { + unset($attributes['user_id']); + } + ksort($attributes); foreach ($attributes as $name => $value) { diff --git a/tests/text_formatter/s9e/utils_test.php b/tests/text_formatter/s9e/utils_test.php index 1c03783792..dade259790 100644 --- a/tests/text_formatter/s9e/utils_test.php +++ b/tests/text_formatter/s9e/utils_test.php @@ -177,6 +177,15 @@ class phpbb_textformatter_s9e_utils_test extends phpbb_test_case ), array( '...', + array( + 'author' => 'user', + 'post_id' => 123, + 'user_id' => ANONYMOUS + ), + '[quote=user post_id=123]...[/quote]', + ), + array( + '...', array('author' => ' '), '[quote=" "]...[/quote]', ), |