hugo

commit 50cc7fe54580018239ea95aafe67f6a158cdcc9f
parent 1773d71d5b40f5a6a14edca417d2818607a499f1
Author: Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>
Date:   Sat, 21 Dec 2019 10:26:14 +0100

tpl: Do not return any value in errorf

Fixes #6653

Diffstat:
M
docs/content/en/functions/errorf.md
 | 
4
++--
M
tpl/fmt/fmt.go
 | 
6
+++---
M
tpl/fmt/init.go
 | 
2
+-

3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docs/content/en/functions/errorf.md b/docs/content/en/functions/errorf.md
@@ -14,14 +14,14 @@ workson: []
 hugoversion:
 relatedfuncs: [printf]
 deprecated: false
-aliases: []
+aliases: [/functions/errorf]
 ---
 
 `errorf` or `warnf` will evaluate a format string, then output the result to the ERROR or WARNING log (and only once per error message to avoid flooding the log).
 
 Any ERROR will also cause the build to fail (the `hugo` command will `exit -1`).
 
-Note that the WARNING will only be printed to the console.
+Both functions return an empty string, so the messages are only printed to the console.
 
 ```
 {{ errorf "Failed to handle page %q" .Path }}
diff --git a/tpl/fmt/fmt.go b/tpl/fmt/fmt.go
@@ -51,11 +51,11 @@ func (ns *Namespace) Println(a ...interface{}) string {
 	return _fmt.Sprintln(a...)
 }
 
-// Errorf formats according to a format specifier and returns the string as a
-// value that satisfies error.
+// Errorf formats according to a format specifier and logs an ERROR.
+// It returns an empty string.
 func (ns *Namespace) Errorf(format string, a ...interface{}) string {
 	ns.errorLogger.Printf(format, a...)
-	return _fmt.Sprintf(format, a...)
+	return ""
 }
 
 // Warnf formats according to a format specifier and logs a WARNING.
diff --git a/tpl/fmt/init.go b/tpl/fmt/init.go
@@ -53,7 +53,7 @@ func init() {
 		ns.AddMethodMapping(ctx.Errorf,
 			[]string{"errorf"},
 			[][2]string{
-				{`{{ errorf "%s." "failed" }}`, `failed.`},
+				{`{{ errorf "%s." "failed" }}`, ``},
 			},
 		)