Bugfixes and Rails Edge
Update to Rails 2.3.1. (Actually, not quite. Doesn't look like 2.3.1 will be released today, but I REALLY want to push these bugfixes out.) Removed bundled Rack (Rails 2.3.1 comes bundled with Rack 1.0). Add config.action_view.cache_template_loading = true to production environment. Fix FastCGI bug (http://rubyforge.org/tracker/index.php?func=detail&aid=24191&group_id=186&atid=783). Fix WikiWords bug (http://rubyforge.org/pipermail/instiki-users/2009-February/001181.html).
This commit is contained in:
parent
0ddef97328
commit
133c21b801
641 changed files with 20541 additions and 71675 deletions
15
vendor/rails/actionpack/lib/action_view/base.rb
vendored
15
vendor/rails/actionpack/lib/action_view/base.rb
vendored
|
@ -182,6 +182,15 @@ module ActionView #:nodoc:
|
|||
# that alert()s the caught exception (and then re-raises it).
|
||||
cattr_accessor :debug_rjs
|
||||
|
||||
# Specify whether templates should be cached. Otherwise the file we be read everytime it is accessed.
|
||||
# Automaticaly reloading templates are not thread safe and should only be used in development mode.
|
||||
@@cache_template_loading = false
|
||||
cattr_accessor :cache_template_loading
|
||||
|
||||
def self.cache_template_loading?
|
||||
ActionController::Base.allow_concurrency || cache_template_loading
|
||||
end
|
||||
|
||||
attr_internal :request
|
||||
|
||||
delegate :request_forgery_protection_token, :template, :params, :session, :cookies, :response, :headers,
|
||||
|
@ -222,6 +231,8 @@ module ActionView #:nodoc:
|
|||
|
||||
def view_paths=(paths)
|
||||
@view_paths = self.class.process_view_paths(paths)
|
||||
# we might be using ReloadableTemplates, so we need to let them know this a new request
|
||||
@view_paths.load!
|
||||
end
|
||||
|
||||
# Returns the result of a render that's dictated by the options hash. The primary options are:
|
||||
|
@ -243,8 +254,8 @@ module ActionView #:nodoc:
|
|||
if options[:layout]
|
||||
_render_with_layout(options, local_assigns, &block)
|
||||
elsif options[:file]
|
||||
tempalte = self.view_paths.find_template(options[:file], template_format)
|
||||
tempalte.render_template(self, options[:locals])
|
||||
template = self.view_paths.find_template(options[:file], template_format)
|
||||
template.render_template(self, options[:locals])
|
||||
elsif options[:partial]
|
||||
render_partial(options)
|
||||
elsif options[:inline]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue