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

Merge pull request #1815 from marc1706/ticket/11525

Browse Source 
[ticket/11525] Only remove group or user prefix from given avatar data
This commit is contained in:
Nils Adermann
2013-11-13 09:52:21 -08:00
parent e48b2c07eb 13a4ceedb1
commit 52845b22f2
7 changed files with 70 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
phpBB/phpbb/avatar/manager.php
View File

@@ -178,14 +178,16 @@ class manager
}
/**
* Strip out user_ and group_ prefixes from 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 (e.g. user), should not include the trailing underscore
*
* @return array User data or group data with keys that have been
* stripped from the preceding "user_" or "group_"
* @return array User or group data with keys that have been
* 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)
static public function clean_row($row, $prefix = '')
{
// Upon creation of a user/group $row might be empty
if (empty($row))
@@ -193,23 +195,19 @@ class manager
return self::$default_row;
}
$keys = array_keys($row);
$values = array_values($row);
$output = array();
foreach ($row as $key => $value)
{
$key = preg_replace("#^(?:{$prefix}_)#", '', $key);
$output[$key] = $value;
}
$keys = array_map(array('\phpbb\avatar\manager', 'strip_prefix'), $keys);
if ($prefix === 'group' && isset($output['id']))
{
$output['id'] = 'g' . $output['id'];
}
return array_combine($keys, $values);
}
/**
* Strip prepending user_ or group_ prefix from key
*
* @param string Array key
* @return string Key that has been stripped from its prefix
*/
static protected function strip_prefix($key)
{
return preg_replace('#^(?:user_|group_)#', '', $key);
return $output;
}
/**