Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-05 20:11:50 +01:00
Code Issues Packages Projects Releases Activity

Changed "mergeConfig" head to match previous method signature

Browse Source
This commit is contained in:
Sommerregen
2015-05-06 23:01:35 +02:00
parent 7ceb0dd065
commit fb31caefef
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -138,14 +138,13 @@ class Plugin implements EventSubscriberInterface
*
* @param Page $page The page to merge the configurations with the
* plugin settings.
* @param bool $deep Should you use deep or shallow merging
* @param array $params Array of additional configuration options to
* merge with the plugin settings.
*
* @param bool $deep Should you use deep or shallow merging
*
* @return \Grav\Common\Data\Data
*/
protected function mergeConfig(Page $page, $params = [], $deep = false)
protected function mergeConfig(Page $page, $deep = false, $params = [])
{
$class_name = $this->name;
$class_name_merged = $class_name . '.merged';