diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-11-10 23:07:07 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-11-10 23:20:48 +0100 |
| commit | aa84f7de04b0efdf871d75694aee60e5ecf37f56 (patch) | |
| tree | 76e117a5a69a4ca2e29c5c27908e0859b361a97c /phpBB/phpbb/avatar | |
| parent | 47f2caff6b3f05f6703e359bf4712bd69d23c04c (diff) | |
| download | forums-aa84f7de04b0efdf871d75694aee60e5ecf37f56.tar forums-aa84f7de04b0efdf871d75694aee60e5ecf37f56.tar.gz forums-aa84f7de04b0efdf871d75694aee60e5ecf37f56.tar.bz2 forums-aa84f7de04b0efdf871d75694aee60e5ecf37f56.tar.xz forums-aa84f7de04b0efdf871d75694aee60e5ecf37f56.zip | |
[ticket/11525] Prefix id parameter with 'g' again when its a group avatar
PHPBB3-11525
Diffstat (limited to 'phpBB/phpbb/avatar')
| -rw-r--r-- | phpBB/phpbb/avatar/manager.php | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php index 90cd83898f..9f6a5fb089 100644 --- a/phpBB/phpbb/avatar/manager.php +++ b/phpBB/phpbb/avatar/manager.php @@ -183,8 +183,9 @@ class manager * @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, $prefix = '') { @@ -198,8 +199,14 @@ class manager $values = array_values($row); 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; } /** |