[Catalyst-commits] r6554 - in trunk/Catalyst-Plugin-Authentication: . lib/Catalyst/Plugin

[matthewt at dev.catalyst.perl.org]

Author: matthewt
Date: 2007-07-17 17:58:45 +0100 (Tue, 17 Jul 2007)
New Revision: 6554

Modified:
   trunk/Catalyst-Plugin-Authentication/
   trunk/Catalyst-Plugin-Authentication/Changes
   trunk/Catalyst-Plugin-Authentication/lib/Catalyst/Plugin/Authentication.pm
Log:
 r35881 at cain (orig r5998):  jayk | 2007-01-20 03:47:13 +0000
 fixing bug in compatibility mode - when no 'authentication' config defined
 



Property changes on: trunk/Catalyst-Plugin-Authentication
___________________________________________________________________
Name: svk:merge
   - 4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-Plugin-Authentication:5864
   + 4ad37cd2-5fec-0310-835f-b3785c72a374:/branches/Catalyst-Plugin-Authentication:5998

Modified: trunk/Catalyst-Plugin-Authentication/Changes
===================================================================
--- trunk/Catalyst-Plugin-Authentication/Changes	2007-07-17 16:58:41 UTC (rev 6553)
+++ trunk/Catalyst-Plugin-Authentication/Changes	2007-07-17 16:58:45 UTC (rev 6554)
@@ -1,10 +1,10 @@
 Revision history for Perl extension Catalyst::Plugin::Authentication
 
 0.10	
-		- major changes to the internals of the plugin, to better encapsulate
-		  credentials and stores.
-		- introduction of 'realms' concept, allowing multiple different
-		  pairs of credential and store in a single application.
+        - major changes to the internals of the plugin, to better encapsulate
+          credentials and stores.
+        - introduction of 'realms' concept, allowing multiple different
+          pairs of credential and store in a single application.
 
 0.09
         - be a bit more pedantic about checking values for definedness before

Modified: trunk/Catalyst-Plugin-Authentication/lib/Catalyst/Plugin/Authentication.pm
===================================================================
--- trunk/Catalyst-Plugin-Authentication/lib/Catalyst/Plugin/Authentication.pm	2007-07-17 16:58:41 UTC (rev 6553)
+++ trunk/Catalyst-Plugin-Authentication/lib/Catalyst/Plugin/Authentication.pm	2007-07-17 16:58:45 UTC (rev 6554)
@@ -187,7 +187,11 @@
 
     if ($c->_auth_realms) { return };
     
-    my $cfg = $c->config->{'authentication'} || {};
+    if (!exists($c->config->{'authentication'}) {
+        $c->config->{'authentication'} = {};
+    }
+    
+    my $cfg = $c->config->{'authentication'};
 
     %$cfg = (
         use_session => 1,