From d0817a29174a43f60784ec1726cd31e4359561b7 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 29 Aug 2021 21:05:14 +0200
Subject: [PATCH 1/3] fix bug #16785 and similar

---
 routers/api/v1/admin/org.go | 1 +
 routers/api/v1/org/org.go   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/routers/api/v1/admin/org.go b/routers/api/v1/admin/org.go
index f1a766d544d71..5da87fa7df1e0 100644
--- a/routers/api/v1/admin/org.go
+++ b/routers/api/v1/admin/org.go
@@ -105,6 +105,7 @@ func GetAllOrgs(ctx *context.APIContext) {
 	listOptions := utils.GetListOptions(ctx)
 
 	users, maxResults, err := models.SearchUsers(&models.SearchUserOptions{
+		Actor:       ctx.User,
 		Type:        models.UserTypeOrganization,
 		OrderBy:     models.SearchOrderByAlphabetically,
 		ListOptions: listOptions,
diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go
index 39ce896cd6707..cf4c328ebbe86 100644
--- a/routers/api/v1/org/org.go
+++ b/routers/api/v1/org/org.go
@@ -128,6 +128,7 @@ func GetAll(ctx *context.APIContext) {
 	listOptions := utils.GetListOptions(ctx)
 
 	publicOrgs, maxResults, err := models.SearchUsers(&models.SearchUserOptions{
+		Actor:       ctx.User,
 		ListOptions: listOptions,
 		Type:        models.UserTypeOrganization,
 		OrderBy:     models.SearchOrderByAlphabetically,

From 1ffb351e5619964107bb1b7beaf743279c4832ee Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 29 Aug 2021 21:05:24 +0200
Subject: [PATCH 2/3] code format

---
 routers/api/v1/user/user.go | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go
index a5e70de54830f..535a49d766488 100644
--- a/routers/api/v1/user/user.go
+++ b/routers/api/v1/user/user.go
@@ -54,15 +54,13 @@ func Search(ctx *context.APIContext) {
 
 	listOptions := utils.GetListOptions(ctx)
 
-	opts := &models.SearchUserOptions{
+	users, maxResults, err := models.SearchUsers(&models.SearchUserOptions{
 		Actor:       ctx.User,
 		Keyword:     ctx.FormTrim("q"),
 		UID:         ctx.FormInt64("uid"),
 		Type:        models.UserTypeIndividual,
 		ListOptions: listOptions,
-	}
-
-	users, maxResults, err := models.SearchUsers(opts)
+	})
 	if err != nil {
 		ctx.JSON(http.StatusInternalServerError, map[string]interface{}{
 			"ok":    false,

From 2c5433a787dac20473cf3279dfaa62229e005892 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Mon, 30 Aug 2021 17:48:54 +0200
Subject: [PATCH 3/3] CI.restart()