bugfix for $c->model and friends.

diff --git a/Changes b/Changes
index 5d15789..d00a42f 100644 (file)
--- a/Changes
+++ b/Changes
@@ -7,6 +7,7 @@ This file documents the revision history for Perl extension Catalyst.
         - Added REDIRECT_URL support for applications running behind
           a RewriteRule in Apache. (Carl Franks)
         - Fixed FastCGI engine under win32. (Carl Franks)
+        - Bugfix for $c->model and friends (defined).
 
 5.61    2005-12-02 00:00:00
         - Fixed ExtUtils::AutoInstall Bootstrap Code in Makefile.PL

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 0553622..7b56a60 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -388,7 +388,7 @@ Gets a L<Catalyst::Controller> instance by name.
 sub controller {
     my ( $c, $name ) = @_;
     my $controller = $c->comp("Controller::$name");
-    return $controller if $controller;
+    return $controller if defined $controller;
     return $c->comp("C::$name");
 }
 
@@ -403,7 +403,7 @@ Gets a L<Catalyst::Model> instance by name.
 sub model {
     my ( $c, $name ) = @_;
     my $model = $c->comp("Model::$name");
-    return $model if $model;
+    return $model if defined $model;
     return $c->comp("M::$name");
 }
 
@@ -418,7 +418,7 @@ Gets a L<Catalyst::View> instance by name.
 sub view {
     my ( $c, $name ) = @_;
     my $view = $c->comp("View::$name");
-    return $view if $view;
+    return $view if defined $view;
     return $c->comp("V::$name");
 }