node to page: Handle URLs

This includes removing the error return value from Permalink and RelPermalink.

We ignore that error all over the place, so we might as well remove it.

Updates #2297
This commit is contained in:
Bjørn Erik Pedersen
2016-11-15 10:43:49 +01:00
parent c8d3124dde
commit 524eb16686
8 changed files with 105 additions and 63 deletions

View File

@@ -299,13 +299,9 @@ func (s *SiteInfo) refLink(ref string, page *Page, relative bool) (string, error
}
if relative {
link, err = target.RelPermalink()
link = target.RelPermalink()
} else {
link, err = target.Permalink()
}
if err != nil {
return "", err
link = target.Permalink()
}
}
@@ -389,11 +385,8 @@ func (s *SiteInfo) SourceRelativeLink(ref string, currentPage *Page) (string, er
return "", fmt.Errorf("No page found for \"%s\" on page \"%s\".\n", ref, currentPage.Source.Path())
}
link, err = target.RelPermalink()
link = target.RelPermalink()
if err != nil {
return "", err
}
}
if refURL.Fragment != "" {