summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2018-12-21 14:18:07 +0100
committerGitHub <noreply@github.com>2018-12-21 14:18:07 +0100
commit588be2e4ff3fce9a64151ef7abb75ceea524b622 (patch)
tree15bce3fc84e492d3b23bb7dbacd98198a514e508
parent9599660feb7bdba9baa6205b514b6002936cd771 (diff)
parent20f01a24ef2fe20728604763fc234daa58f25d79 (diff)
Merge pull request #261 from nextcloud/bugfix/noid/nocsrfcheck
adding NoCSRFRequired to globalActorAvatar
-rw-r--r--lib/Controller/LocalController.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/Controller/LocalController.php b/lib/Controller/LocalController.php
index 1fad9f4d..95b5434e 100644
--- a/lib/Controller/LocalController.php
+++ b/lib/Controller/LocalController.php
@@ -207,8 +207,6 @@ class LocalController extends Controller {
}
-
-
/**
* @NoCSRFRequired
* @NoAdminRequired
@@ -230,7 +228,6 @@ class LocalController extends Controller {
}
-
/**
* @NoAdminRequired
* @PublicPage
@@ -423,6 +420,7 @@ class LocalController extends Controller {
$actor = $this->cacheActorService->getFromLocalAccount($username);
$actor->setCompleteDetails(true);
+
return $this->success(['account' => $actor]);
} catch (Exception $e) {
return $this->fail($e);
@@ -514,6 +512,7 @@ class LocalController extends Controller {
}
/**
+ * @NoCSRFRequired
* @NoAdminRequired
*
* @param string $id