[Catalyst-commits] r10615 - Catalyst-Controller-RHTMLO/trunk/lib/Catalyst/Controller

[jgottshall at dev.catalyst.perl.org]

Author: jgottshall
Date: 2009-06-22 19:48:33 +0000 (Mon, 22 Jun 2009)
New Revision: 10615

Modified:
   Catalyst-Controller-RHTMLO/trunk/lib/Catalyst/Controller/RHTMLO.pm
Log:
Fix config glitch


Modified: Catalyst-Controller-RHTMLO/trunk/lib/Catalyst/Controller/RHTMLO.pm
===================================================================
--- Catalyst-Controller-RHTMLO/trunk/lib/Catalyst/Controller/RHTMLO.pm	2009-06-22 18:06:48 UTC (rev 10614)
+++ Catalyst-Controller-RHTMLO/trunk/lib/Catalyst/Controller/RHTMLO.pm	2009-06-22 19:48:33 UTC (rev 10615)
@@ -7,6 +7,8 @@
 use MRO::Compat;    # to get $self->next::method() right
 use Catalyst::Utils;
 
+our $VERSION='0.002';
+
 =head1 NAME
 
 Catalyst::Controller::RHTMLO - Catalyst base controller for integrating 
@@ -237,9 +239,9 @@
     # merge global config with controller-specific config
     #TODO refactor this into Moose role for Catalyst components in general
     $arguments = $self->merge_config_hashes( 
-        $c->config->{'Catalyst::Controller::RHTMLO'},
+        ( $c->config->{'Catalyst::Controller::RHTMLO'} || {} ),
         $arguments 
-    ) if defined $c->config->{'Catalyst::Controller::RHTMLO'};
+    );
 
     # set default form prefix according to appname
     $self->config->{form_prefix} = $c->config->{name} . "::Form";