hugo

Unnamed repository; edit this file 'description' to name the repository.

git clone git://git.shimmy1996.com/hugo.git
commit be1a566203292bff51298afd4c8c46bd6df7cc0a
parent be1287fba05fb87e80aaf3c277dd7c74408375e2
Author: bep <bjorn.erik.pedersen@gmail.com>
Date:   Thu, 14 May 2015 21:37:53 +0200

Only uglify 404.html on server root

`404.html` needs to be that and not `/404/` in the root.

There seem to be content pages in the wild with the name `404` (Hugo docs),
so this commit adds an extra check so only root 404 pages ignore the `uglifyURLs`setting.

Fixes #1140

Diffstat:
Mtarget/page.go | 3++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/target/page.go b/target/page.go
@@ -40,13 +40,14 @@ func (pp *PagePub) Translate(src string) (dest string, err error) {
 	}
 
 	dir, file := filepath.Split(src)
+	isRoot := dir == ""
 	ext := pp.extension(filepath.Ext(file))
 	name := filename(file)
 	if pp.PublishDir != "" {
 		dir = filepath.Join(pp.PublishDir, dir)
 	}
 
-	if pp.UglyURLs || file == "index.html" || file == "404.html" {
+	if pp.UglyURLs || file == "index.html" || (isRoot && file == "404.html") {
 		return filepath.Join(dir, fmt.Sprintf("%s%s", name, ext)), nil
 	}