3 files changed, 8 insertions, 14 deletions
diff --git a/routers/home.go b/routers/home.go
index 437c569a79..a9c4774867 100644
--- a/routers/home.go
+++ b/routers/home.go
@@ -7,7 +7,6 @@ package routers
 
 import (
 	"bytes"
-	"net/url"
 	"strings"
 
 	"code.gitea.io/gitea/models"
@@ -48,7 +47,7 @@ func Home(ctx *context.Context) {
 		} else if ctx.User.MustChangePassword {
 			ctx.Data["Title"] = ctx.Tr("auth.must_change_password")
 			ctx.Data["ChangePasscodeLink"] = setting.AppSubURL + "/user/change_password"
-			ctx.SetCookie("redirect_to", url.QueryEscape(setting.AppSubURL+ctx.Req.RequestURI), 0, setting.AppSubURL)
+			ctx.SetCookie("redirect_to", setting.AppSubURL+ctx.Req.RequestURI, 0, setting.AppSubURL)
 			ctx.Redirect(setting.AppSubURL + "/user/settings/change_password")
 		} else {
 			user.Dashboard(ctx)
diff --git a/routers/private/repository.go b/routers/private/repository.go
index 0769e1f250..9f451bcf1d 100644
--- a/routers/private/repository.go
+++ b/routers/private/repository.go
@@ -6,7 +6,6 @@ package private
 
 import (
 	"net/http"
-	"net/url"
 
 	"code.gitea.io/gitea/models"
 
@@ -56,18 +55,18 @@ func GetRepository(ctx *macaron.Context) {
 func GetActivePullRequest(ctx *macaron.Context) {
 	baseRepoID := ctx.QueryInt64("baseRepoID")
 	headRepoID := ctx.QueryInt64("headRepoID")
-	baseBranch, err := url.QueryUnescape(ctx.QueryTrim("baseBranch"))
-	if err != nil {
+	baseBranch := ctx.QueryTrim("baseBranch")
+	if len(baseBranch) == 0 {
 		ctx.JSON(http.StatusInternalServerError, map[string]interface{}{
-			"err": err.Error(),
+			"err": "QueryTrim failed",
 		})
 		return
 	}
 
-	headBranch, err := url.QueryUnescape(ctx.QueryTrim("headBranch"))
-	if err != nil {
+	headBranch := ctx.QueryTrim("headBranch")
+	if len(headBranch) == 0 {
 		ctx.JSON(http.StatusInternalServerError, map[string]interface{}{
-			"err": err.Error(),
+			"err": "QueryTrim failed",
 		})
 		return
 	}
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 043fc5c93a..c61ae905f7 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -10,7 +10,6 @@ import (
 	"container/list"
 	"fmt"
 	"io"
-	"net/url"
 	"path"
 	"strings"
 
@@ -633,10 +632,7 @@ func ParseCompareInfo(ctx *context.Context) (*models.User, *models.Repository, *
 		infoPath   string
 		err        error
 	)
-	infoPath, err = url.QueryUnescape(ctx.Params("*"))
-	if err != nil {
-		ctx.NotFound("QueryUnescape", err)
-	}
+	infoPath = ctx.Params("*")
 	infos := strings.Split(infoPath, "...")
 	if len(infos) != 2 {
 		log.Trace("ParseCompareInfo[%d]: not enough compared branches information %s", baseRepo.ID, infos)