X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=bfbf763df1f7a97238ab097047447421ebb9a552;hp=8eb58389f490bb20bdce28f14422a83cdd845c34;hb=6dae3eef2b4e3c38a657201e77672aef830a87f6;hpb=2f3812528068bc1d9f7840067f0c03d36cd47e6d

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 8eb5838..bfbf763 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -506,7 +506,7 @@ sub _comp_names {
 sub _filter_component {
     my ( $c, $comp, @args ) = @_;
 
-    if ( eval { $comp->can('ACCEPT_CONTEXT'); } ) {
+    if ( Scalar::Util::blessed($c) && eval { $comp->can('ACCEPT_CONTEXT'); } ) {
         return $comp->ACCEPT_CONTEXT( $c, @args );
     }
     
@@ -2475,6 +2475,8 @@ Gary Ashton Jones
 
 Geoff Richards
 
+ilmari: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
+
 jcamacho: Juan Camacho
 
 Jody Belka
@@ -2505,6 +2507,8 @@ omega: Andreas Marienborg
 
 phaylon: Robert Sedlacek <phaylon@dunkelheit.at>
 
+rafl: Florian Ragwitz <rafl@debian.org>
+
 sky: Arthur Bergman
 
 the_jester: Jesse Sheidlower