makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2 from nickvergessen/marc/ticket/11525

Browse source 
Marc/ticket/11525
This commit is contained in:
Marc Alexander 2013-11-10 14:25:58 -08:00
commit 4468525ee3
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
phpBB/phpbb/avatar/manager.php
View file

@ -180,11 +180,12 @@ class manager
/** /**
* Strip out user_, group_, or other prefixes from array keys * Strip out user_, group_, or other prefixes from array keys
* *
* @param array $row User data or group data * @param array $row User data or group data
* @param string $prefix Prefix of data keys * @param string $prefix Prefix of data keys (e.g. user), should not include the trailing underscore
* *
* @return array User data or group data with keys that have been * @return array User or group data with keys that have been
* stripped from the preceding "user_" or "group_" * stripped from the preceding "user_" or "group_"
* Also the group id is prefixed with g, when the prefix group is removed.
*/ */
static public function clean_row($row, $prefix = '') static public function clean_row($row, $prefix = '')
{ {
@ -198,15 +199,24 @@ class manager
$values = array_values($row); $values = array_values($row);
array_walk($keys, array('\phpbb\avatar\manager', 'strip_prefix'), $prefix); array_walk($keys, array('\phpbb\avatar\manager', 'strip_prefix'), $prefix);
$row = array_combine($keys, $values);
return array_combine($keys, $values); if ($prefix == 'group')
{
$row['id'] = 'g' . $row['id'];
}
return $row;
} }
/** /**
* Strip prepending user_ or group_ prefix from key * Strip prepending user_ or group_ prefix from key
* *
* @param string Array key * @param string $key Array key
* @return void * @param string $null Parameter is ignored by the function, just required by the array_walk
* @param string $prefix Prefix that should be stripped off from the keys (e.g. user)
* Should not include the trailing underscore
* @return null
*/ */
static protected function strip_prefix(&$key, $null, $prefix) static protected function strip_prefix(&$key, $null, $prefix)
{ {