allow debug to be disabled via Env.

[catagits/Catalyst-Runtime.git] / lib / Catalyst.pm
diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm

index b85ac7f..01b9e8d 100644 (file)
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -646,7 +646,8 @@ sub welcome_message {
                 float: right;
                 margin-left: 10px;
             }
-            b#appname {
+            span#appname {
+                font-weight: bold;
                 font-size: 1.6em;
             }
         </style>
@@ -654,7 +655,7 @@ sub welcome_message {
     <body>
         <div id="content">
             <div id="topbar">
-                <h1><b id="appname">$name</b> on <a href="http://catalyst.perl.org">Catalyst</a>
+                <h1><span id="appname">$name</span> on <a href="http://catalyst.perl.org">Catalyst</a>
                     $VERSION</h1>
              </div>
              <div id="answers">
@@ -1562,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');