Fix #248 (Plugin language interference) and fixed summary

This commit is contained in:
Sommerregen
2015-08-06 19:59:20 +02:00
parent 4bebdfe0c7
commit dc5ba9eff4
2 changed files with 2 additions and 4 deletions

View File

@@ -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);
}
}

View File

@@ -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