Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12457] Default to first category if none is selected in gallery avatar
This commit is contained in:
Andreas Fischer 2014-06-05 02:26:48 +02:00
commit 0326c96e50

View file

@ -36,7 +36,7 @@ class local extends \phpbb\avatar\driver\driver
public function prepare_form($request, $template, $user, $row, &$error)
{
$avatar_list = $this->get_avatar_list($user);
$category = $request->variable('avatar_local_cat', '');
$category = $request->variable('avatar_local_cat', key($avatar_list));
foreach ($avatar_list as $cat => $null)
{