Respect UI.ExploreDefaultSort setting again

6543 · 6543 · commit cf26af68edea · 2024-10-28T17:57:11.000+01:00
fix regression of #29430
diff --git a/routers/web/explore/org.go b/routers/web/explore/org.go
@@ -39,7 +39,7 @@ func Organizations(ctx *context.Context) {
 	)
 	sortOrder := ctx.FormString("sort")
 	if sortOrder == "" {
-		sortOrder = "newest"
+		sortOrder = setting.UI.ExploreDefaultSort
 		ctx.SetFormString("sort", sortOrder)
 	}
 
diff --git a/routers/web/explore/user.go b/routers/web/explore/user.go
@@ -149,7 +149,7 @@ func Users(ctx *context.Context) {
 	)
 	sortOrder := ctx.FormString("sort")
 	if sortOrder == "" {
-		sortOrder = "newest"
+		sortOrder = setting.UI.ExploreDefaultSort
 		ctx.SetFormString("sort", sortOrder)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ func Organizations(ctx *context.Context) {`
`39`	`39`	`)`
`40`	`40`	`sortOrder := ctx.FormString("sort")`
`41`	`41`	`if sortOrder == "" {`
`42`		`- sortOrder = "newest"`
	`42`	`+ sortOrder = setting.UI.ExploreDefaultSort`
`43`	`43`	`ctx.SetFormString("sort", sortOrder)`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ func Users(ctx *context.Context) {`
`149`	`149`	`)`
`150`	`150`	`sortOrder := ctx.FormString("sort")`
`151`	`151`	`if sortOrder == "" {`
`152`		`- sortOrder = "newest"`
	`152`	`+ sortOrder = setting.UI.ExploreDefaultSort`
`153`	`153`	`ctx.SetFormString("sort", sortOrder)`
`154`	`154`	`}`
`155`	`155`