summaryrefslogtreecommitdiffstats
path: root/hugolib/alias.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2017-03-16 10:04:30 +0100
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2017-03-27 15:43:56 +0200
commita49bf8707b7f247f1c83b8087abd02a84d2ba136 (patch)
tree7a8be1f41507ee103771ab8ec2c03f7a460097fe /hugolib/alias.go
parentd76e5f36b412eb68be3cd5a53bacc099ec46280f (diff)
hugolib: Remove siteWriter
Diffstat (limited to 'hugolib/alias.go')
-rw-r--r--hugolib/alias.go15
1 files changed, 7 insertions, 8 deletions
diff --git a/hugolib/alias.go b/hugolib/alias.go
index 9a23d6d0b..63f0bb996 100644
--- a/hugolib/alias.go
+++ b/hugolib/alias.go
@@ -41,14 +41,13 @@ func init() {
}
type aliasHandler struct {
- Templates *template.Template
- log *jww.Notepad
- allowRoot bool
- publishDir string
+ Templates *template.Template
+ log *jww.Notepad
+ allowRoot bool
}
-func newAliasHandler(t *template.Template, l *jww.Notepad, allowRoot bool, publishDir string) aliasHandler {
- return aliasHandler{t, l, allowRoot, publishDir}
+func newAliasHandler(t *template.Template, l *jww.Notepad, allowRoot bool) aliasHandler {
+ return aliasHandler{t, l, allowRoot}
}
func (a aliasHandler) renderAlias(isXHTML bool, permalink string, page *Page) (io.Reader, error) {
@@ -85,7 +84,7 @@ func (s *Site) writeDestAlias(path, permalink string, p *Page) (err error) {
func (s *Site) publishDestAlias(allowRoot bool, path, permalink string, p *Page) (err error) {
- handler := newAliasHandler(s.Tmpl.Lookup("alias.html"), s.Log, allowRoot, s.absPublishDir())
+ handler := newAliasHandler(s.Tmpl.Lookup("alias.html"), s.Log, allowRoot)
isXHTML := strings.HasSuffix(path, ".xhtml")
@@ -183,5 +182,5 @@ func (a aliasHandler) targetPathAlias(src string) (string, error) {
a.log.INFO.Printf("Alias \"%s\" translated to \"%s\"\n", originalAlias, alias)
}
- return filepath.Join(a.publishDir, alias), nil
+ return alias, nil
}