mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/11525] Only remove group or user prefix from given avatar data

Browse Source 
Until now, the user data had both user_id and group_id keys in the avatar
data. As both group_ and user_ prefixes were removed the group_id was
collapsed onto the user_id and therefore all users in the same group had
the same prefix for their uploaded avatars. This patch will make sure
that the correct id is used depending on whether it's a group's or user's
avatar data.

PHPBB3-11525
This commit is contained in:
Marc Alexander
2013-10-24 13:55:23 +02:00
parent 2adf3d7a34
commit 9d4d212e0f
7 changed files with 55 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tests/avatar/manager_test.php
View File

@@ -201,20 +201,58 @@ class phpbb_avatar_manager_test extends PHPUnit_Framework_TestCase
'foobar_avatar_height' => '',
),
),
array(
array(
'user_avatar' => '',
'user_id' => 5,
'group_id' => 4,
),
array(
'avatar' => '',
'id' => 4,
),
),
array(
array(
'user_avatar' => '',
'user_id' => 5,
'group_id' => 4,
),
array(
'avatar' => '',
'id' => 5,
'group_id' => 4,
),
'user',
),
array(
array(
'group_avatar' => '',
'user_id' => 5,
'group_id' => 4,
),
array(
'avatar' => '',
'id' => 4,
'user_id' => 5,
),
'group',
),
);
}
/**
* @dataProvider database_row_data
*/
public function test_clean_row(array $input, array $output)
public function test_clean_row(array $input, array $output, $prefix = '')
{
$cleaned_row = array();
$cleaned_row = \phpbb\avatar\manager::clean_row($input);
foreach ($output as $key => $null)
$cleaned_row = \phpbb\avatar\manager::clean_row($input, $prefix);
foreach ($output as $key => $value)
{
$this->assertArrayHasKey($key, $cleaned_row);
$this->assertEquals($output[$key], $value);
}
}