From 6b887a98cd4a0d9ee22cd69bc453ce9dbf962d69 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Wed, 29 Jan 2020 18:55:44 +0200 Subject: [PATCH] Fixed `site.metadata` saving issues [#2615] --- CHANGELOG.md | 1 + system/src/Grav/Common/Page/Page.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11082e872..cbb4408d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ * Fixed `Data::filter()` removing empty fields (such as empty list) by default [#2805](https://github.com/getgrav/grav/issues/2805) * Fixed fatal error with non-integer page param value [#2803](https://github.com/getgrav/grav/issues/2803) * Fixed `Assets::addInlineJs()` parameter type mismatch between v1.5 and v1.6 [#2659](https://github.com/getgrav/grav/issues/2659) + * Fixed `site.metadata` saving issues [#2615](https://github.com/getgrav/grav/issues/2615) # v1.6.19 ## 12/04/2019 diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php index 16ba4f97e..75bf45340 100644 --- a/system/src/Grav/Common/Page/Page.php +++ b/system/src/Grav/Common/Page/Page.php @@ -1694,7 +1694,7 @@ class Page implements PageInterface $metadata['generator'] = 'GravCMS'; // Get initial metadata for the page - $metadata = array_merge($metadata, Grav::instance()['config']->get('site.metadata')); + $metadata = array_merge($metadata, Grav::instance()['config']->get('site.metadata', [])); if (isset($this->header->metadata) && is_array($this->header->metadata)) { // Merge any site.metadata settings in with page metadata