Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

O

our_own_cloud_project
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Incidents

Snippets Groups Projects

b0036ecf

Commit b0036ecf authored 9 years ago by Arthur Schiwon

Downloads
- Plain Diff

Merge pull request #17464 from owncloud/fix-17232

fix uncaught exception on not permitted file types when setting avatar, fixes #17232

parents 81d9066d 0967a547

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

apps/user_ldap/lib/user/user.php 7 additions, 1 deletion

apps/user_ldap/lib/user/user.php
apps/user_ldap/tests/integration/abstractintegrationtest.php 137 additions, 0 deletions

apps/user_ldap/tests/integration/abstractintegrationtest.php
apps/user_ldap/tests/integration/data/avatar-invalid.gif 0 additions, 0 deletions

apps/user_ldap/tests/integration/data/avatar-invalid.gif
apps/user_ldap/tests/integration/data/avatar-valid.jpg 0 additions, 0 deletions

apps/user_ldap/tests/integration/data/avatar-valid.jpg
apps/user_ldap/tests/integration/fakemanager.php 33 additions, 0 deletions

apps/user_ldap/tests/integration/fakemanager.php
apps/user_ldap/tests/integration/lib/IntegrationTestAccessGroupsMatchFilter.php 33 additions, 95 deletions

...ntegration/lib/IntegrationTestAccessGroupsMatchFilter.php
apps/user_ldap/tests/integration/lib/user/IntegrationTestUserAvatar.php 128 additions, 0 deletions

.../tests/integration/lib/user/IntegrationTestUserAvatar.php
apps/user_ldap/tests/integration/run-test.sh 1 addition, 1 deletion

apps/user_ldap/tests/integration/run-test.sh
apps/user_ldap/tests/integration/setup-scripts/createExplicitUsers.php 1 addition, 1 deletion

...p/tests/integration/setup-scripts/createExplicitUsers.php

with 340 additions and 98 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment