Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 1222

Show
Ignore:
Timestamp:
04/19/05 09:57:15 (3 years ago)
Author:
david
Message:

Fixed that rendering a template would require a connection to the database #1146

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/actionpack/lib/action_controller/benchmarking.rb

    r1221 r1222  
    2222        db_runtime = ActiveRecord::Base.connection.reset_runtime if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected? 
    2323        @rendering_runtime = Benchmark::measure{ render_without_benchmark(template_name, status) }.real 
    24         @db_rt_before_render = db_runtime 
    25         @db_rt_after_render = ActiveRecord::Base.connection.reset_runtime if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected? 
    26         @rendering_runtime -= @db_rt_after_render 
     24 
     25        if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected? 
     26          @db_rt_before_render = db_runtime 
     27          @db_rt_after_render = ActiveRecord::Base.connection.reset_runtime 
     28          @rendering_runtime -= @db_rt_after_render 
     29        end 
    2730      end 
    2831    end