aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshyPHP <s9e.dev@gmail.com>2015-07-13 16:08:57 +0200
committerJoshyPHP <s9e.dev@gmail.com>2015-07-13 16:08:57 +0200
commit675cf5e897944318f9666b088a5053f339fe1032 (patch)
tree542c7013e19f3c21382b7e48e21a8ba119e98873
parent8df16ed92c65228593167d3f187a05ccf85f5a9d (diff)
downloadforums-675cf5e897944318f9666b088a5053f339fe1032.tar
forums-675cf5e897944318f9666b088a5053f339fe1032.tar.gz
forums-675cf5e897944318f9666b088a5053f339fe1032.tar.bz2
forums-675cf5e897944318f9666b088a5053f339fe1032.tar.xz
forums-675cf5e897944318f9666b088a5053f339fe1032.zip
[ticket/14008] Do not add a user_id value to quotes from guests
PHPBB3-14008
-rw-r--r--phpBB/phpbb/textformatter/s9e/utils.php6
-rw-r--r--tests/text_formatter/s9e/utils_test.php9
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]',
),