[Jifty-commit] r5621 - in jifty/trunk: lib/Jifty/Action/Record

[Jifty commits]

Author: trs
Date: Thu Jul 31 10:38:30 2008
New Revision: 5621

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Action/Record/Execute.pm

Log:
 r38265 at zot:  tom | 2008-07-31 10:19:29 -0400
 Apply the same parameter merging fix to Execute actions that Create and Update got the other week


Modified: jifty/trunk/lib/Jifty/Action/Record/Execute.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Action/Record/Execute.pm	(original)
+++ jifty/trunk/lib/Jifty/Action/Record/Execute.pm	Thu Jul 31 10:38:30 2008
@@ -4,8 +4,6 @@
 package Jifty::Action::Record::Execute;
 use base qw/ Jifty::Action::Record /;
 
-use Hash::Merge;
-
 =head1 NAME
 
 Jifty::Action::Record::Execute - Simple abstract based for record actions
@@ -87,11 +85,15 @@
         # primary key fields should always be hidden fields
     }
 
-    # XXX Should this be moved up into Jifty::Action::Record?
-    return Hash::Merge::merge( 
-        $arguments, 
-        (eval { $self->PARAMS } || {}),
-    );
+    if ( $self->can('PARAMS') ) {
+        use Jifty::Param::Schema;
+        return Jifty::Param::Schema::merge_params(
+            $arguments, ($self->PARAMS || {})
+        );
+    }
+    else {
+        return $arguments;
+    }
 }
 
 =head2 take_action