review fix

Author: zokkis

routers/web/explore/code.go

@@ -5,7 +5,6 @@ package explore
 
 import (
 	"net/http"
-	"net/url"
 
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/modules/base"
@@ -38,9 +37,9 @@ func Code(ctx *context.Context) {
 	queryType := ctx.FormTrim("t")
 	isMatch := queryType == "match"
 
-	ctx.Data["Keyword"] = url.PathEscape(keyword)
-	ctx.Data["Language"] = url.PathEscape(language)
-	ctx.Data["queryType"] = url.PathEscape(queryType)
+	ctx.Data["Keyword"] = keyword
+	ctx.Data["Language"] = language
+	ctx.Data["queryType"] = queryType
 	ctx.Data["PageIsViewCode"] = true
 
 	if keyword == "" {

routers/web/explore/repo.go

@@ -108,7 +108,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 	ctx.Data["TopicOnly"] = topicOnly
 
 	language := ctx.FormTrim("language")
-	ctx.Data["Language"] = url.PathEscape(language)
+	ctx.Data["Language"] = url.QueryEscape(language)
 
 	archived := ctx.FormOptionalBool("archived")
 	ctx.Data["IsArchived"] = archived
@@ -163,7 +163,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 		return
 	}
 
-	ctx.Data["Keyword"] = url.PathEscape(keyword)
+	ctx.Data["Keyword"] = keyword
 	ctx.Data["Total"] = count
 	ctx.Data["Repos"] = repos
 	ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled

routers/web/org/home.go

@@ -5,7 +5,6 @@ package org
 
 import (
 	"net/http"
-	"net/url"
 	"path"
 	"strings"
 
@@ -48,7 +47,7 @@ func Home(ctx *context.Context) {
 	ctx.Data["Title"] = org.DisplayName()
 
 	var orderBy db.SearchOrderBy
-	ctx.Data["SortType"] = url.PathEscape(ctx.FormString("sort"))
+	ctx.Data["SortType"] = ctx.FormString("sort")
 	switch ctx.FormString("sort") {
 	case "newest":
 		orderBy = db.SearchOrderByNewest
@@ -76,10 +75,10 @@ func Home(ctx *context.Context) {
 	}
 
 	keyword := ctx.FormTrim("q")
-	ctx.Data["Keyword"] = url.PathEscape(keyword)
+	ctx.Data["Keyword"] = keyword
 
 	language := ctx.FormTrim("language")
-	ctx.Data["Language"] = url.PathEscape(language)
+	ctx.Data["Language"] = language
 
 	page := ctx.FormInt("page")
 	if page <= 0 {

routers/web/repo/search.go

@@ -5,7 +5,6 @@ package repo
 
 import (
 	"net/http"
-	"net/url"
 
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
@@ -28,9 +27,9 @@ func Search(ctx *context.Context) {
 	queryType := ctx.FormTrim("t")
 	isMatch := queryType == "match"
 
-	ctx.Data["Keyword"] = url.PathEscape(keyword)
-	ctx.Data["Language"] = url.PathEscape(language)
-	ctx.Data["queryType"] = url.PathEscape(queryType)
+	ctx.Data["Keyword"] = keyword
+	ctx.Data["Language"] = language
+	ctx.Data["queryType"] = queryType
 	ctx.Data["PageIsViewCode"] = true
 
 	if keyword == "" {

routers/web/user/code.go

@@ -5,7 +5,6 @@ package user
 
 import (
 	"net/http"
-	"net/url"
 
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/modules/base"
@@ -43,9 +42,9 @@ func CodeSearch(ctx *context.Context) {
 	queryType := ctx.FormTrim("t")
 	isMatch := queryType == "match"
 
-	ctx.Data["Keyword"] = url.PathEscape(keyword)
-	ctx.Data["Language"] = url.PathEscape(language)
-	ctx.Data["queryType"] = url.PathEscape(queryType)
+	ctx.Data["Keyword"] = keyword
+	ctx.Data["Language"] = language
+	ctx.Data["queryType"] = queryType
 	ctx.Data["IsCodePage"] = true
 
 	if keyword == "" {

routers/web/user/profile.go

@@ -7,7 +7,6 @@ package user
 import (
 	"fmt"
 	"net/http"
-	"net/url"
 	"path"
 	"strings"
 
@@ -138,10 +137,10 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 	}
 
 	keyword := ctx.FormTrim("q")
-	ctx.Data["Keyword"] = url.PathEscape(keyword)
+	ctx.Data["Keyword"] = keyword
 
 	language := ctx.FormTrim("language")
-	ctx.Data["Language"] = url.PathEscape(language)
+	ctx.Data["Language"] = language
 
 	followers, numFollowers, err := user_model.GetUserFollowers(ctx, ctx.ContextUser, ctx.Doer, db.ListOptions{
 		PageSize: pagingNum,