[Jifty-commit] r5927 - in jifty/trunk: .

[Jifty commits]

Author: clkao
Date: Sun Oct 12 11:23:41 2008
New Revision: 5927

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

Log:
Merge PARAMS correctly so actions with schema {} declared arguments can
be used by subclasses that use schema {} as well.


Modified: jifty/trunk/Makefile.PL
==============================================================================
--- jifty/trunk/Makefile.PL	(original)
+++ jifty/trunk/Makefile.PL	Sun Oct 12 11:23:41 2008
@@ -68,6 +68,7 @@
 requires('Scalar::Defer' => '0.12');
 requires('Shell::Command');
 requires('String::Koremutake');
+requires('SUPER');
 requires('SQL::ReservedWords');
 requires('Template::Declare' => '0.26');                # Template::Declare::Tags
 requires('Test::Base');

Modified: jifty/trunk/lib/Jifty/Param/Schema.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Param/Schema.pm	(original)
+++ jifty/trunk/lib/Jifty/Param/Schema.pm	Sun Oct 12 11:23:41 2008
@@ -83,6 +83,8 @@
 use Jifty::I18N;
 use Jifty::Param;
 use Scalar::Defer;
+use SUPER;
+
 use Object::Declare (
     mapping => {
         param => 'Jifty::Param',
@@ -127,7 +129,7 @@
         $count += 10;
     }
 
-    if (my $super_params = $from->can('SUPER::PARAMS')) {
+    if (my $super_params = $from->super('PARAMS')) {
         $from->PARAMS(merge_params( $super_params->(), { @params } ));
     }
     else {