aboutsummaryrefslogtreecommitdiffhomepage
path: root/reader/opml
diff options
context:
space:
mode:
authorGravatar Frédéric Guillot <fred@miniflux.net>2018-03-14 18:50:06 -0700
committerGravatar Frédéric Guillot <fred@miniflux.net>2018-03-14 18:50:06 -0700
commitec08f45bf5bec3d6c359352f65e50d39a8306a51 (patch)
treea6602acd2845b69b4bae9dac9c1ae1ef919937b6 /reader/opml
parentdd68181a83f383f80234080d7fd5b5532415cace (diff)
Fix broken OPML import with Go 1.10
Diffstat (limited to 'reader/opml')
-rw-r--r--reader/opml/handler.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/reader/opml/handler.go b/reader/opml/handler.go
index ec05670..56083c7 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)