Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-15 20:12:46 +02:00
Code Issues Packages Projects Releases Activity

Incorporated Gertt's modifications into PR

Browse Source
This commit is contained in:
Sommerregen
2015-06-20 14:36:25 +02:00
parent 6dbb6eb432
commit 752a3ca5bd
1 changed files with 16 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
system/src/Grav/Common/Plugin.php
View File

@@ -151,59 +151,35 @@ class Plugin implements EventSubscriberInterface
$defaults = $this->config->get('plugins.'. $class_name, []);
$page_header = $page->header();
$header = [];
if (isset($page_header->$class_name_merged)) {
$merged = $page_header->$class_name_merged;
if (count($merged) > 0) {
$header = $merged->toArray();
} else {
$header = $defaults;
}
// Merge additional parameter with configuration options
if ($deep) {
$header = array_replace_recursive($header, $params);
} else {
$header = array_merge($header, $params);
}
$config = new Data($header);
return $config;
}
// Get default plugin configurations and retrieve page header configuration
if (isset($page_header->$class_name)) {
if (!isset($page_header->$class_name_merged) && isset($page_header->$class_name)) {
// Get default plugin configurations and retrieve page header configuration
$config = $page_header->$class_name;
if (is_bool($config)) {
// Overwrite enabled option with boolean value in page header
$config = ['enabled' => $config];
}
} else {
$config = [];
// Merge page header settings using deep or shallow merging technique
if ($deep) {
$header = array_replace_recursive($defaults, $config);
} else {
$header = array_merge($defaults, $config);
}
// Create new config object and set it on the page object so it's cached for next time
$page->modifyHeader($class_name_merged, new Data($header));
} else if (isset($page_header->$class_name_merged)) {
$merged = $page_header->$class_name_merged;
$header = $merged->toArray();
}
// Merge page header settings using deep or shallow merging technique
if ($deep) {
$header = array_replace_recursive($defaults, $config);
} else {
$header = array_merge($defaults, $config);
if (empty($header)) {
$header = $defaults;
}
// Create new config object and set it on the page object so it's cached for next time
$config = new Data($header);
$page->modifyHeader($class_name_merged, $config);
// Merge additional parameter with configuration options
if ($deep) {
$header = array_replace_recursive($header, $params);
} else {
$header = array_merge($header, $params);
}
// Create config data object again (now with addtional parameters)
$config = new Data($header);
// Return configurations as a new data config class
return $config;
return new Data($header);
}
}