Added recursive -r flag to prove example

[catagits/Catalyst-Runtime.git] / lib / Catalyst.pm

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 4ee89df..bf3049b 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -7,13 +7,12 @@ use Catalyst::Exception;
 use Catalyst::Log;
 use Catalyst::Utils;
 use NEXT;
-use Text::ASCIITable;
 use Path::Class;
 our $CATALYST_SCRIPT_GEN = 4;
 
 __PACKAGE__->mk_classdata($_) for qw/arguments dispatcher engine log/;
 
-our $VERSION = '5.24';
+our $VERSION = '5.34';
 our @ISA;
 
 =head1 NAME
@@ -126,16 +125,16 @@ Returns a hashref containing your applications settings.
 
 sub import {
     my ( $class, @arguments ) = @_;
+    
+    # We have to limit $class to Catalyst to avoid pushing Catalyst upon every
+    # callers @ISA.
+    return unless $class eq 'Catalyst';
 
     my $caller = caller(0);
-    
-    # Prepare inheritance
-    unless ( $caller->isa($class) ) {
-        
+
+    unless ( $caller->isa('Catalyst') ) {
         no strict 'refs';
         push @{"$caller\::ISA"}, $class;
-        
-        *{"$caller\::import"} = sub { 1 };
     }
 
     $caller->arguments( [ @arguments ] );
@@ -242,17 +241,55 @@ Web:
 
 =back
 
-=head1 AUTHOR
+=head1 CREDITS
 
-Sebastian Riedel, C<sri@oook.de>
+Andy Grundman
+
+Andrew Ford
+
+Andrew Ruthven
+
+Autrijus Tang
+
+Christian Hansen
+
+Christopher Hicks
+
+Dan Sully
+
+Danijel Milicevic
+
+David Naughton
+
+Gary Ashton Jones
 
-=head1 THANK YOU
+Geoff Richards
 
-Andy Grundman, Andrew Ford, Andrew Ruthven, Autrijus Tang, Christian Hansen,
-Christopher Hicks, Dan Sully, Danijel Milicevic, David Naughton,
-Gary Ashton Jones, Geoff Richards, Jesse Sheidlower, Jody Belka,
-Johan Lindstrom, Juan Camacho, Leon Brocard, Marcus Ramberg,
-Tatsuhiko Miyagawa and all the others who've helped.
+Jesse Sheidlower
+
+Jody Belka
+
+Johan Lindstrom
+
+Juan Camacho
+
+Leon Brocard
+
+Marcus Ramberg
+
+Matt S Trout
+
+Robert Sedlacek
+
+Sebastian Riedel
+
+Tatsuhiko Miyagawa
+
+Ulf Edvinsson
+
+=head1 AUTHOR
+
+Sebastian Riedel, C<sri@oook.de>
 
 =head1 LICENSE