From 504e2c4437db6f0962d28334a7e2db036a1deaad Mon Sep 17 00:00:00 2001
From: groditi <groditi@03d0b0b2-0e1a-0410-a411-fdb2f4bd65d7>
Date: Tue, 6 May 2008 17:27:54 +0000
Subject: minor style cleanups and non-destructive config merging in Controller

---
 lib/Reaction/UI/Controller.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/Reaction/UI/Controller.pm')

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;
-- 
cgit v1.2.3-54-g00ecf