summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2017-10-15 21:38:40 +0200
committerGitHub <noreply@github.com>2017-10-15 21:38:40 +0200
commit3438020d667c976a28fcefe54f2554865ca0f352 (patch)
tree1adf8f7a905cb407fd2dca85a7b9da7681b10df7 /core
parent7a05cf300c6b3d4bdfff1bb61aa39822ff88fb8b (diff)
parent8ad17a66d6f7c1dd365efe3bfc31191fdd533f0e (diff)
downloadnextcloud-server-3438020d667c976a28fcefe54f2554865ca0f352.tar.gz
nextcloud-server-3438020d667c976a28fcefe54f2554865ca0f352.zip
Merge pull request #6813 from nextcloud/exclude-avatar-from-same-site-cookie
Exclude avatar from Same-Site Cookie requirement
Diffstat (limited to 'core')
-rw-r--r--core/Controller/AvatarController.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php
index e4d13d218a5..bf9a576398e 100644
--- a/core/Controller/AvatarController.php
+++ b/core/Controller/AvatarController.php
@@ -115,6 +115,7 @@ class AvatarController extends Controller {
/**
* @NoAdminRequired
* @NoCSRFRequired
+ * @NoSameSiteCookieRequired
* @PublicPage
*
* @param string $userId