[Jifty-commit] r5561 - in jifty/trunk: lib/Jifty/Action/Record
Jifty commits
jifty-commit at lists.jifty.org
Sun Jul 20 23:17:38 EDT 2008
Author: sterling
Date: Sun Jul 20 23:17:37 2008
New Revision: 5561
Modified:
jifty/trunk/ (props changed)
jifty/trunk/lib/Jifty/Action/Record/Execute.pm
jifty/trunk/lib/Jifty/Action/Record/Update.pm
Log:
r98266 at shanenka-lt-osx: shanenka | 2008-07-20 22:12:11 -0500
Changing the way merges are calculated to work (and prevent test failures).
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 Sun Jul 20 23:17:37 2008
@@ -90,7 +90,7 @@
# XXX Should this be moved up into Jifty::Action::Record?
return Hash::Merge::merge(
$arguments,
- ($self->can('PARAMS') && $self->PARAMS),
+ (eval { $self->PARAMS } || {}),
);
}
Modified: jifty/trunk/lib/Jifty/Action/Record/Update.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Action/Record/Update.pm (original)
+++ jifty/trunk/lib/Jifty/Action/Record/Update.pm Sun Jul 20 23:17:37 2008
@@ -55,7 +55,7 @@
# XXX Should this be moved up into Jifty::Action::Record?
return Hash::Merge::merge(
$arguments,
- ($self->can('PARAMS') && $self->PARAMS)
+ (eval { $self->PARAMS } || {}),
);
}
More information about the Jifty-commit
mailing list