[Catalyst-commits] r6575 - in trunk/Catalyst-Runtime: . lib

[marcus at dev.catalyst.perl.org]

Author: marcus
Date: 2007-07-18 12:56:51 +0100 (Wed, 18 Jul 2007)
New Revision: 6575

Modified:
   trunk/Catalyst-Runtime/Changes
   trunk/Catalyst-Runtime/lib/Catalyst.pm
Log:
Make _register_plugin use ensure_class_loaded

Modified: trunk/Catalyst-Runtime/Changes
===================================================================
--- trunk/Catalyst-Runtime/Changes	2007-07-18 11:45:07 UTC (rev 6574)
+++ trunk/Catalyst-Runtime/Changes	2007-07-18 11:56:51 UTC (rev 6575)
@@ -2,6 +2,7 @@
 
         - Fix bug where a nested component would be setup twice
         - Make ensure_class_loaded behave better with malformed class name
+		- Make _register_plugin use ensure_class_loaded
 
 5.7008
         - Fixed a bug where Content-Length could be set to 0 if a filehandle

Modified: trunk/Catalyst-Runtime/lib/Catalyst.pm
===================================================================
--- trunk/Catalyst-Runtime/lib/Catalyst.pm	2007-07-18 11:45:07 UTC (rev 6574)
+++ trunk/Catalyst-Runtime/lib/Catalyst.pm	2007-07-18 11:56:51 UTC (rev 6575)
@@ -2158,9 +2158,7 @@
         my ( $proto, $plugin, $instant ) = @_;
         my $class = ref $proto || $proto;
 
-        unless (Class::Inspector->loaded($plugin)) {
-            require Class::Inspector->filename($plugin);
-        }
+        Catalyst::Utils::ensure_class_loaded( $plugin, { ignore_loaded => 1 } );
 
         $proto->_plugins->{$plugin} = 1;
         unless ($instant) {