correct escaping

Author: zokkis

routers/web/explore/repo.go

@@ -6,7 +6,6 @@ package explore
 import (
 	"fmt"
 	"net/http"
-	"net/url"
 
 	"code.gitea.io/gitea/models/db"
 	repo_model "code.gitea.io/gitea/models/repo"
@@ -108,7 +107,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 	ctx.Data["TopicOnly"] = topicOnly
 
 	language := ctx.FormTrim("language")
-	ctx.Data["Language"] = url.QueryEscape(language)
+	ctx.Data["Language"] = language
 
 	archived := ctx.FormOptionalBool("archived")
 	ctx.Data["IsArchived"] = archived

templates/shared/repo_search.tmpl

@@ -12,13 +12,13 @@
 			<button class="ui primary button">{{ctx.Locale.Tr "explore.search"}}</button>
 		</div>
 	</form>
-	{{$tabQuery := printf "tab=%s&" .TabName}}
-	{{if not .TabName}}{{$tabQuery = ""}}{{end}}
-	{{$languageQuery := printf "language=%s&" .Language}}
-	{{if not .TabName}}{{$languageQuery = ""}}{{end}}
-	{{$queryParams := printf "%s%sq=%s" $tabQuery $languageQuery .Keyword}}
+	{{$tabQuery := ""}}
+	{{if .TabName}}{{$tabQuery = printf "tab=%s&" (QueryEscape .TabName)}}{{end}}
+	{{$languageQuery := ""}}
+	{{if .TabName}}{{$languageQuery = printf "language=%s&" (QueryEscape .Language)}}{{end}}
+	{{$queryParams := printf "%s%sq=%s" $tabQuery $languageQuery (QueryEscape .Keyword)}}
 	<!-- Filter -->
-	{{$queryParamsWithSort := printf "%s&sort=%s" $queryParams .SortType}}
+	{{$queryParamsWithSort := printf "%s&sort=%s" $queryParams (QueryEscape .SortType)}}
 	<form class="ui form ignore-dirty" id="repo-search-form" data-query-params="{{$queryParamsWithSort}}">
 		<div class="ui dropdown type jump item gt-mr-0">
 			<span class="text">