[Jifty-commit] jifty branch, master, updated. 836b32803d0f02eca608463c207c45e7dd4bd49b

Jifty commits jifty-commit at lists.jifty.org
Thu Mar 18 18:32:03 EDT 2010


The branch, master has been updated
       via  836b32803d0f02eca608463c207c45e7dd4bd49b (commit)
      from  40d1b4d51bcbd09d65c4a1aa270c200ac3212cce (commit)

Summary of changes:
 Makefile.PL               |    2 +-
 lib/Jifty/Param/Schema.pm |    7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 836b32803d0f02eca608463c207c45e7dd4bd49b
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Fri Mar 19 06:31:02 2010 +0800

    update code for Hash::Merge 0.12: we can specify_behavior with a name only once

diff --git a/Makefile.PL b/Makefile.PL
index 93129bc..409f2ed 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -50,7 +50,7 @@ requires('HTTP::Cookies');
 requires('HTTP::Date');
 requires('HTTP::Server::Simple' => '0.35');  # HTTP::Server::Simple::CGI
 requires('HTTP::Server::Simple::Recorder');
-requires('Hash::Merge');
+requires('Hash::Merge', '0.12');
 requires('Hash::MultiValue', 0.05);
 requires('Hook::LexWrap');
 requires('IO::Handle::Util');
diff --git a/lib/Jifty/Param/Schema.pm b/lib/Jifty/Param/Schema.pm
index 5eadd49..b0f9385 100644
--- a/lib/Jifty/Param/Schema.pm
+++ b/lib/Jifty/Param/Schema.pm
@@ -168,6 +168,11 @@ use constant MERGE_PARAM_BEHAVIOUR => {
             HASH   => sub { Hash::Merge::_merge_hashes( $_[0], $_[1] ) } }
 };
 
+my $prev_behaviour = Hash::Merge::get_behavior();
+# the behavior name must be upper-case
+Hash::Merge::specify_behavior( MERGE_PARAM_BEHAVIOUR, 'MERGE_PARAMS' );
+Hash::Merge::set_behavior( $prev_behaviour );
+
 =head2 merge_params HASHREF HASHREF
 
 Takes two hashrefs. Merges them together and returns the merged hashref.
@@ -202,7 +207,7 @@ sub merge_params {
     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" );
+    Hash::Merge::set_behavior( 'MERGE_PARAMS' );
     my $rv = Hash::Merge::merge(@_);
     Hash::Merge::set_behavior( $prev_behaviour );
     Hash::Merge::set_clone_behavior($prev_clone_behaviour);

-----------------------------------------------------------------------


More information about the Jifty-commit mailing list