fix compile error

diff --git a/gogs.go b/gogs.go
index c3f264c2d62524c6dcf1afe9eb454785165b3a33..6085cd71e4f1d889c98a832111406f40badf8ba5 100644 (file)
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
        "github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.5.8.1209 Beta"
+const APP_VER = "0.5.8.1210 Beta"
 
 func init() {
        runtime.GOMAXPROCS(runtime.NumCPU())

diff --git a/modules/base/tool.go b/modules/base/tool.go
index 3c435fbdb1c38ddd939c17bc30b3a529a9cf5007..ff5a4f4cd94e20d4aa4a89f27468159af511c476 100644 (file)
--- a/modules/base/tool.go
+++ b/modules/base/tool.go
@@ -11,7 +11,6 @@ import (
        "crypto/sha1"
        "encoding/base64"
        "encoding/hex"
-       "errors"
        "fmt"
        "hash"
        "html/template"
@@ -41,15 +40,14 @@ func EncodeSha1(str string) string {
        return hex.EncodeToString(h.Sum(nil))
 }
 
-func BasicAuthDecode(encoded string) (user string, name string, err error) {
-       var s []byte
-       s, err = base64.StdEncoding.DecodeString(encoded)
+func BasicAuthDecode(encoded string) (string, string, error) {
+       s, err := base64.StdEncoding.DecodeString(encoded)
        if err != nil {
-               return user, name, err
+               return "", "", err
        }
 
        auth := strings.SplitN(string(s), ":", 2)
-       return auth[0], auth[1], err
+       return auth[0], auth[1], nil
 }
 
 func BasicAuthEncode(username, password string) string {

diff --git a/templates/.VERSION b/templates/.VERSION
index f7e9d476cc936bb92bd19f2ad21b973c7aa86352..e5200d1825bbd17e393d886345c29e7329c41f86 100644 (file)
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.5.8.1209 Beta
\ No newline at end of file
+0.5.8.1210 Beta
\ No newline at end of file