[Jifty-commit] r6907 - jifty/trunk/lib/Jifty/Plugin/Config/Action

[Jifty commits]

Author: sunnavy
Date: Tue Apr 28 03:37:12 2009
New Revision: 6907

Modified:
   jifty/trunk/lib/Jifty/Plugin/Config/Action/Config.pm

Log:
keep the old Plugins stuff in site_config instead of dumping all into it, because of the array merge problem(duplicate occurs)

Modified: jifty/trunk/lib/Jifty/Plugin/Config/Action/Config.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/Config/Action/Config.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/Config/Action/Config.pm	Tue Apr 28 03:37:12 2009
@@ -78,8 +78,17 @@
         }
     }
 
-    Jifty::YAML::DumpFile( $ENV{'JIFTY_SITE_CONFIG'}
-          || Jifty::Util->app_root . '/etc/site_config.yml', $stash );
+    # hack
+    # do *not* dump all the Plugins stuff because Plugins is arrayref
+    # dumping all will cause duplicate problems
+    # instead, we keep the old Plugins
+    my $site_config_file = $ENV{'JIFTY_SITE_CONFIG'}
+      || Jifty::Util->app_root . '/etc/site_config.yml';
+    if ( -e $site_config_file ) {
+        my $site_config = Jifty::YAML::LoadFile($site_config_file);
+        $stash->{framework}{Plugins} = $site_config->{framework}{Plugins};
+    }
+    Jifty::YAML::DumpFile( $site_config_file, $stash );
     Jifty->config->load;
     $self->report_success unless $self->result->failure;