diff options
author | groditi <groditi@03d0b0b2-0e1a-0410-a411-fdb2f4bd65d7> | 2008-05-06 17:27:54 +0000 |
---|---|---|
committer | groditi <groditi@03d0b0b2-0e1a-0410-a411-fdb2f4bd65d7> | 2008-05-06 17:27:54 +0000 |
commit | 504e2c4437db6f0962d28334a7e2db036a1deaad (patch) | |
tree | 0b64238e77c8757f9e4e33bc50387b519c38628b /lib/Reaction/UI/Controller.pm | |
parent | 380db9499e0bc97280526f890fe7e31c547c1a1d (diff) | |
download | reaction-504e2c4437db6f0962d28334a7e2db036a1deaad.tar.gz reaction-504e2c4437db6f0962d28334a7e2db036a1deaad.zip |
minor style cleanups and non-destructive config merging in Controller
Diffstat (limited to 'lib/Reaction/UI/Controller.pm')
-rw-r--r-- | lib/Reaction/UI/Controller.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Reaction/UI/Controller.pm b/lib/Reaction/UI/Controller.pm index 9093fd3..a6ff6ef 100644 --- a/lib/Reaction/UI/Controller.pm +++ b/lib/Reaction/UI/Controller.pm @@ -22,7 +22,7 @@ sub push_viewport { if (my $conf_class = delete $vp_attr->{class}) { $class = $conf_class; } - %args = (%$vp_attr, @proto_args); + %args = %{ $self->merge_config_hashes($vp_attr, {@proto_args}) }; } else { $class = $vp_attr; %args = @proto_args; |