From 456cce0653181eb9fa35124c11872183bc6a1975 Mon Sep 17 00:00:00 2001 From: Alicia Sykes Date: Mon, 26 Jul 2021 20:16:00 +0100 Subject: [PATCH] :bug: Adds safeguard for when pageInfo isnt specified --- src/utils/ConfigAccumalator.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/utils/ConfigAccumalator.js b/src/utils/ConfigAccumalator.js index 1237897c..6a5e0928 100644 --- a/src/utils/ConfigAccumalator.js +++ b/src/utils/ConfigAccumalator.js @@ -48,11 +48,12 @@ export default class ConfigAccumulator { } catch (e) { localPageInfo = {}; } + const filePageInfo = this.conf.pageInfo || {}; const pi = this.conf.pageInfo || defaults; // The page info object to return - pi.title = localPageInfo.title || conf.pageInfo.title || defaults.title; - pi.description = localPageInfo.description || conf.pageInfo.description || defaults.description; - pi.navLinks = localPageInfo.navLinks || conf.pageInfo.navLinks || defaults.navLinks; - pi.footerText = localPageInfo.footerText || conf.pageInfo.footerText || defaults.footerText; + pi.title = localPageInfo.title || filePageInfo.title || defaults.title; + pi.description = localPageInfo.description || filePageInfo.description || defaults.description; + pi.navLinks = localPageInfo.navLinks || filePageInfo.navLinks || defaults.navLinks; + pi.footerText = localPageInfo.footerText || filePageInfo.footerText || defaults.footerText; return pi; }