X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=01b9e8d4ad9132ca9a2e1e8089ef180839b0a1a1;hb=59c2b3bd20a496dceafecff5e231e46af51e8a69;hp=66dd7d3edb8aff52165746fdea8691021d5c4d16;hpb=9619f23cf3582248bc6a324a975f37406e1efad4;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 66dd7d3..01b9e8d 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -1563,7 +1563,12 @@ sub setup_log {
         $class->log( Catalyst::Log->new );
     }
 
-    if ( $ENV{CATALYST_DEBUG} || $ENV{ uc($class) . '_DEBUG' } || $debug ) {
+    
+    if ( $ENV{CATALYST_DEBUG} || 
+         $ENV{ Catalyst::Utils->class2env($class) . '_DEBUG' } || 
+         $debug  &&
+         $ENV{CATALYST_DEBUG} != 0 && 
+         $ENV{ Catalyst::Utils->class2env($class).'_DEBUG' } != 0 ) {
         no strict 'refs';
         *{"$class\::debug"} = sub { 1 };
         $class->log->debug('Debug messages enabled');