Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblock
This commit is contained in:
Tristan Darricau 2014-08-24 00:26:57 +02:00
commit 8144de3792

View file

@ -4664,7 +4664,7 @@ function phpbb_get_group_avatar($user_row, $alt = 'GROUP_AVATAR', $ignore_config
/**
* Get avatar
*
* @param array $row Row cleaned by \phpbb\avatar\driver\driver::clean_row
* @param array $row Row cleaned by \phpbb\avatar\manager::clean_row
* @param string $alt Optional language string for alt tag within image, can be a language key or text
* @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP
*