From b65d48541d0d3986ed739a2b5eb193f35c20bdff Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Wed, 1 Jul 2020 20:54:22 +0300 Subject: [PATCH] Fixed `Language::getDefault()` returning false and not null --- CHANGELOG.md | 1 + system/src/Grav/Common/Language/Language.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65f5e2840..de0c55447 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ * Fixed broken `Flex Page` authorization for groups * Fixed missing `onAdminSave` and `onAdminAfterSave` events when using `Flex Pages` and `Flex Users` [flex-objects#58](https://github.com/trilbymedia/grav-plugin-flex-objects/issues/58) * Fixed new `User Group` allowing bad group name to be saved [admin#1917](https://github.com/getgrav/grav-plugin-admin/issues/1917) + * Fixed `Language::getDefault()` returning false and not null # v1.7.0-rc.12 ## 06/08/2020 diff --git a/system/src/Grav/Common/Language/Language.php b/system/src/Grav/Common/Language/Language.php index 1bd20810e..a1dea4ea6 100644 --- a/system/src/Grav/Common/Language/Language.php +++ b/system/src/Grav/Common/Language/Language.php @@ -67,7 +67,7 @@ class Language if (isset($default) && $this->validate($default)) { $this->default = $default; } else { - $this->default = reset($this->languages); + $this->default = !empty($this->languages) ? reset($this->languages) : null; } $this->resetFallbackPageExtensions();