diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-08-11 17:38:29 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-08-11 17:38:29 +0200 |
| commit | 837ed8b6e1b2a76a56ff487f7df9a4b9ef5afc60 (patch) | |
| tree | e858d476e5b87f678eb1b9b9c95c15a04bdfe558 /phpBB/phpbb/avatar/driver/upload.php | |
| parent | f09db1a7b4d9172035a461e90ce6fa3d7b544df3 (diff) | |
| parent | bad90dafbfe8a093a518b90b82a01d4e63e757f2 (diff) | |
| download | forums-837ed8b6e1b2a76a56ff487f7df9a4b9ef5afc60.tar forums-837ed8b6e1b2a76a56ff487f7df9a4b9ef5afc60.tar.gz forums-837ed8b6e1b2a76a56ff487f7df9a4b9ef5afc60.tar.bz2 forums-837ed8b6e1b2a76a56ff487f7df9a4b9ef5afc60.tar.xz forums-837ed8b6e1b2a76a56ff487f7df9a4b9ef5afc60.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[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
Conflicts:
phpBB/styles/subsilver2/template/ucp_groups_manage.html
phpBB/styles/subsilver2/template/ucp_profile_avatar.html
Diffstat (limited to 'phpBB/phpbb/avatar/driver/upload.php')
| -rw-r--r-- | phpBB/phpbb/avatar/driver/upload.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php index f5ba50451a..003b23659f 100644 --- a/phpBB/phpbb/avatar/driver/upload.php +++ b/phpBB/phpbb/avatar/driver/upload.php @@ -129,7 +129,6 @@ class upload extends \phpbb\avatar\driver\driver } else { - $error[] = 'NO_AVATAR_SELECTED'; return false; } |