From f25d8a9e17fb65fa41dafdcbf0358853d68eaf45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?=
 <bjorn.erik.pedersen@gmail.com>
Date: Fri, 5 Jan 2018 11:07:50 +0100
Subject: Fix sub-folder baseURL handling for Page resources

I.e. images etc.

Fixes #4228
---
 helpers/pathspec.go | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'helpers/pathspec.go')

diff --git a/helpers/pathspec.go b/helpers/pathspec.go
index 281203712..450391f16 100644
--- a/helpers/pathspec.go
+++ b/helpers/pathspec.go
@@ -26,6 +26,10 @@ import (
 type PathSpec struct {
 	BaseURL
 
+	// If the baseURL contains a base path, e.g. https://example.com/docs, then "/docs" will be the BasePath.
+	// This will not be set if canonifyURLs is enabled.
+	BasePath string
+
 	disablePathToLower bool
 	removePathAccents  bool
 	uglyURLs           bool
@@ -124,6 +128,13 @@ func NewPathSpec(fs *hugofs.Fs, cfg config.Provider) (*PathSpec, error) {
 		ProcessingStats:                NewProcessingStats(lang),
 	}
 
+	if !ps.canonifyURLs {
+		basePath := ps.BaseURL.url.Path
+		if basePath != "" && basePath != "/" {
+			ps.BasePath = basePath
+		}
+	}
+
 	publishDir := ps.AbsPathify(cfg.GetString("publishDir")) + FilePathSeparator
 	// If root, remove the second '/'
 	if publishDir == "//" {
-- 
cgit v1.2.3