X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FApp%2FSCS%2FPageSet.pm;h=fdaf44274892b6477b27c5f5df2fb3a950e1ce7c;hb=c68d9e18d8bcc980605bc5466ed8782a5cb5dcf8;hp=731f4937c6568cc184cbc36c8c0d1b5ef5cf6211;hpb=fd5c2ec2b8daefffdb4dc95b01f1118dde99a7fb;p=scpubgit%2FApp-SCS.git

diff --git a/lib/App/SCS/PageSet.pm b/lib/App/SCS/PageSet.pm
index 731f493..fdaf442 100644
--- a/lib/App/SCS/PageSet.pm
+++ b/lib/App/SCS/PageSet.pm
@@ -111,12 +111,16 @@ sub _inflate {
   }
   my $raw = $io->all;
   try {
+
     my $extracted = $self->${\"_extract_from_${type}"}($raw);
     my $jsony = JSONY->new;
-    my $config = reduce { merge($a, $jsony->load($b->all)) } {}, @$config_files;
+    my $config = reduce { merge($a, $jsony->load($b->all)) } [], @$config_files;
 
     $extracted->{plugins} = pond_read_datum('[' . $extracted->{plugins} . ']');
-    my $setup = merge($extracted, $config);
+
+    my $setup = $extracted;
+
+    $setup->{plugin_config} = merge($extracted->{plugins}, $config);
 
     try {
         my $tmp_cache = io($cache_name . ".tmp");