mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-21 21:35:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid nilpointer on no File on Page

Browse Source 
Fixes #5781
This commit is contained in:
Bjørn Erik Pedersen
2019-03-25 18:18:34 +01:00
parent 794d4052b8
commit 4dae52af68
15 changed files with 213 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hugolib/page.go
View File

@@ -236,7 +236,7 @@ func (p *pageState) TranslationKey() string {
p.translationKeyInit.Do(func() {
if p.m.translationKey != "" {
p.translationKey = p.Kind() + "/" + p.m.translationKey
} else if p.IsPage() && p.File() != nil {
} else if p.IsPage() && !p.File().IsZero() {
p.translationKey = path.Join(p.Kind(), filepath.ToSlash(p.File().Dir()), p.File().TranslationBaseName())
} else if p.IsNode() {
p.translationKey = path.Join(p.Kind(), p.SectionsPath())
@@ -462,7 +462,7 @@ func (p *pageState) Render(layout ...string) template.HTML {
func (p *pageState) wrapError(err error) error {
var filename string
if p.File() != nil {
if !p.File().IsZero() {
filename = p.File().Filename()
}
@@ -665,7 +665,7 @@ func (p *pageState) parseError(err error, input []byte, offset int) error {
}
func (p *pageState) pathOrTitle() string {
if p.File() != nil {
if !p.File().IsZero() {
return p.File().Filename()
}
@@ -763,7 +763,7 @@ func (p *pageState) sortParentSections() {
// For pages that do not (sections witout content page etc.), it returns the
// virtual path, consistent with where you would add a source file.
func (p *pageState) sourceRef() string {
if p.File() != nil {
if !p.File().IsZero() {
sourcePath := p.File().Path()
if sourcePath != "" {
return "/" + filepath.ToSlash(sourcePath)