mirror of
https://github.com/getgrav/grav.git
synced 2026-02-16 11:37:50 +01:00
Fix #248 (Plugin language interference) and fixed summary
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user