mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-20 15:31:42 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github-marc1706/ticket/12822' into develop-ascraeus

Browse Source 
* github-marc1706/ticket/12822:
  [ticket/12822] Fix test runs of avatar manager_test
  [ticket/12822] Add method for deleting avatars and use confirm_box
  [ticket/12822] Remove "None" option from avatar select boxes
This commit is contained in:
Nils Adermann
2014-08-11 17:37:56 +02:00
parent 91df95a90d 70978e96d3
commit bad90dafbf
22 changed files with 238 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/phpbb/avatar/driver/upload.php
View File

@@ -129,7 +129,6 @@ class upload extends \phpbb\avatar\driver\driver
}
else
{
$error[] = 'NO_AVATAR_SELECTED';
return false;
}