From dfee5fdea9c91782ae8d6522aab9d60da1c1f41d Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Sat, 9 Jan 2016 23:34:31 +0100 Subject: [PATCH] Avoid setting empty metadata --- system/src/Grav/Common/Page/Page.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php index 4cf61791d..f9db28b0d 100644 --- a/system/src/Grav/Common/Page/Page.php +++ b/system/src/Grav/Common/Page/Page.php @@ -1152,11 +1152,12 @@ class Page $this->metadata = []; + $metadata = []; // Set the Generator tag - $this->metadata['generator'] = array('name'=>'generator', 'content'=>'GravCMS'); + $metadata['generator'] = array('name'=>'generator', 'content'=>'GravCMS'); // Get initial metadata for the page - $metadata = self::getGrav()['config']->get('site.metadata'); + $metadata = array_merge($metadata, self::getGrav()['config']->get('site.metadata')); if (isset($this->header->metadata)) { // Merge any site.metadata settings in with page metadata @@ -1173,12 +1174,15 @@ class Page } // If it this is a standard meta data type } else { - if (in_array($key, $header_tag_http_equivs)) { - $this->metadata[$key] = array('http_equiv'=>$key, 'content'=>htmlspecialchars($value, ENT_QUOTES)); - } else { - $this->metadata[$key] = array('name'=>$key, 'content'=>htmlspecialchars($value, ENT_QUOTES)); + if ($value) { + if (in_array($key, $header_tag_http_equivs)) { + $this->metadata[$key] = array('http_equiv'=>$key, 'content'=>htmlspecialchars($value, ENT_QUOTES)); + } else { + $this->metadata[$key] = array('name'=>$key, 'content'=>htmlspecialchars($value, ENT_QUOTES)); + } } } + } }