From ec08f45bf5bec3d6c359352f65e50d39a8306a51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Wed, 14 Mar 2018 18:50:06 -0700 Subject: [PATCH] Fix broken OPML import with Go 1.10 --- reader/opml/handler.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/reader/opml/handler.go b/reader/opml/handler.go index ec05670a..56083c75 100644 --- a/reader/opml/handler.go +++ b/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. -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) if err != nil { return err @@ -50,6 +50,7 @@ func (h *Handler) Import(userID int64, data io.Reader) (err error) { for _, subscription := range subscriptions { if !h.store.FeedURLExists(userID, subscription.FeedURL) { var category *model.Category + var err error if subscription.CategoryName == "" { category, err = h.store.FirstCategory(userID)