From dc5ba9eff4e8511fae3babad0df80020fed3aecb Mon Sep 17 00:00:00 2001 From: Sommerregen Date: Thu, 6 Aug 2015 19:59:20 +0200 Subject: [PATCH] Fix #248 (Plugin language interference) and fixed summary --- system/src/Grav/Common/Config/Config.php | 4 +--- system/src/Grav/Common/Page/Page.php | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/system/src/Grav/Common/Config/Config.php b/system/src/Grav/Common/Config/Config.php index 98a7b3da8..cc1feeac6 100644 --- a/system/src/Grav/Common/Config/Config.php +++ b/system/src/Grav/Common/Config/Config.php @@ -371,9 +371,7 @@ class Config extends Data foreach ((array) $languageFiles['user/plugins'] as $plugin => $item) { $lang_file = CompiledYamlFile::instance($item['file']); $content = $lang_file->content(); - foreach ((array) $content as $lang => $value) { - $this->languages->join($lang, $value, '/'); - } + $this->languages->mergeRecursive($content); } } diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php index 83b7a0588..ca5fabb7e 100644 --- a/system/src/Grav/Common/Page/Page.php +++ b/system/src/Grav/Common/Page/Page.php @@ -332,7 +332,7 @@ class Page // Return summary based on settings in site config file if (!$config['enabled']) { - return $content; + return $this->content(); } // Set up variables to process summary from page or from custom summary