瀏覽代碼

Fix broken OPML import with Go 1.10

Frédéric Guillot 8 年之前
父節點
當前提交
ec08f45bf5
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      reader/opml/handler.go

+ 2 - 1
reader/opml/handler.go

@@ -41,7 +41,7 @@ func (h *Handler) Export(userID int64) (string, error) {
 }
 }
 
 
 // Import parses and create feeds from an OPML import.
 // Import parses and create feeds from an OPML import.
-func (h *Handler) Import(userID int64, data io.Reader) (err error) {
+func (h *Handler) Import(userID int64, data io.Reader) error {
 	subscriptions, err := Parse(data)
 	subscriptions, err := Parse(data)
 	if err != nil {
 	if err != nil {
 		return err
 		return err
@@ -50,6 +50,7 @@ func (h *Handler) Import(userID int64, data io.Reader) (err error) {
 	for _, subscription := range subscriptions {
 	for _, subscription := range subscriptions {
 		if !h.store.FeedURLExists(userID, subscription.FeedURL) {
 		if !h.store.FeedURLExists(userID, subscription.FeedURL) {
 			var category *model.Category
 			var category *model.Category
+			var err error
 
 
 			if subscription.CategoryName == "" {
 			if subscription.CategoryName == "" {
 				category, err = h.store.FirstCategory(userID)
 				category, err = h.store.FirstCategory(userID)