[Jifty-commit] r5959 - jifty/trunk/lib/Jifty/Param

[Jifty commits]

Author: clkao
Date: Wed Oct 22 10:19:44 2008
New Revision: 5959

Modified:
   jifty/trunk/lib/Jifty/Param/Schema.pm

Log:
Do not clone during hash::merge for action params, otherwise it breaks
scalar::defer objects.

Modified: jifty/trunk/lib/Jifty/Param/Schema.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Param/Schema.pm	(original)
+++ jifty/trunk/lib/Jifty/Param/Schema.pm	Wed Oct 22 10:19:44 2008
@@ -199,9 +199,12 @@
         push @types, \@t;
     }
     my $prev_behaviour = Hash::Merge::get_behavior();
+    my $prev_clone_behaviour = Hash::Merge::get_clone_behavior();
+    Hash::Merge::set_clone_behavior(0);
     Hash::Merge::specify_behavior( MERGE_PARAM_BEHAVIOUR, "merge_params" );
     my $rv = Hash::Merge::merge(@_);
     Hash::Merge::set_behavior( $prev_behaviour );
+    Hash::Merge::set_clone_behavior($prev_clone_behaviour);
     for my $m (@_) {
         my @t = @{shift @types};
         for (keys %{$m}) {