diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-03-07 13:03:27 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-03-07 13:03:27 +0100 |
| commit | bb584627248cc95443ebda511fca51effea6d0af (patch) | |
| tree | b63cc36eb22e8c9220d8c4be31d43c30457f176a /phpBB/includes | |
| parent | 5963905825ed65a522fe94e380c6c179a461e437 (diff) | |
| download | forums-bb584627248cc95443ebda511fca51effea6d0af.tar forums-bb584627248cc95443ebda511fca51effea6d0af.tar.gz forums-bb584627248cc95443ebda511fca51effea6d0af.tar.bz2 forums-bb584627248cc95443ebda511fca51effea6d0af.tar.xz forums-bb584627248cc95443ebda511fca51effea6d0af.zip | |
[ticket/11404] Use a default data row if $row is empty in clean_row()
A statically defined $default_row will be used inside the
phpbb_avatar_manager::clean_row() method if the $row passed to it is
empty.
PHPBB3-11404
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/avatar/manager.php | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/phpBB/includes/avatar/manager.php b/phpBB/includes/avatar/manager.php index f126d69300..58d994c3c0 100644 --- a/phpBB/includes/avatar/manager.php +++ b/phpBB/includes/avatar/manager.php @@ -46,6 +46,17 @@ class phpbb_avatar_manager protected $container; /** + * Default avatar data row + * @var array + */ + static protected $default_row = array( + 'avatar' => '', + 'avatar_type' => '', + 'avatar_width' => '', + 'avatar_height' => '', + ); + + /** * Construct an avatar manager object * * @param phpbb_config $config phpBB configuration @@ -174,20 +185,15 @@ class phpbb_avatar_manager */ static public function clean_row($row) { - $keys = array_keys($row); - $values = array_values($row); - // Upon creation of a user/group $row might be empty - if (empty($keys)) + if (empty($row)) { - return array( - 'avatar' => '', - 'avatar_type' => '', - 'avatar_width' => '', - 'avatar_height' => '', - ); + return self::$default_row; } + $keys = array_keys($row); + $values = array_values($row); + $keys = array_map(array('phpbb_avatar_manager', 'strip_prefix'), $keys); return array_combine($keys, $values); |