Changeset 1871

Show
Ignore:
Timestamp:
04/13/08 04:23:59 (3 months ago)
Author:
bchoate
Message:

If PerformanceLogging is not enabled don't return a timer object from get_timer.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/release-34/lib/MT.pm.pre

    r1823 r1871  
    978978    $mt = MT->instance unless ref $mt; 
    979979    my $timer = $mt->request('timer'); 
    980     unless ($timer) { 
    981         my $uri; 
    982         if ($mt->isa('MT::App')) { 
    983             $uri = $mt->uri( args => { $mt->param_hash } ); 
    984         } 
    985         require MT::Util::ReqTimer; 
    986         $timer = MT::Util::ReqTimer->new( $uri ); 
     980    unless (defined $timer) { 
     981        if (MT->config('PerformanceLogging')) { 
     982            my $uri; 
     983            if ($mt->isa('MT::App')) { 
     984                $uri = $mt->uri( args => { $mt->param_hash } ); 
     985            } 
     986            require MT::Util::ReqTimer; 
     987            $timer = MT::Util::ReqTimer->new( $uri ); 
     988        } else { 
     989            $timer = 0; 
     990        } 
    987991        $mt->request('timer', $timer); 
    988992    }