diff options
| author | Adam McCrea <adam@adamlogic.com> | 2009-02-05 15:23:05 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-02-05 15:23:05 -0600 |
| commit | 06182ea02e92afad579998aa80144588e8865ac3 (patch) | |
| tree | 075368c3a5026a26f0d13de95830fbe7ac2d4521 /actionpack/lib/action_controller/layout.rb | |
| parent | b6e7a76cc573ee35c1df648f35d5865672f55e15 (diff) | |
| download | rails-06182ea02e92afad579998aa80144588e8865ac3.tar.gz rails-06182ea02e92afad579998aa80144588e8865ac3.tar.bz2 rails-06182ea02e92afad579998aa80144588e8865ac3.zip | |
implicitly rendering a js response should not use the default layout [#1844 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
Diffstat (limited to 'actionpack/lib/action_controller/layout.rb')
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index 183d56c2e8..d6bcf7a8c1 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -173,7 +173,7 @@ module ActionController #:nodoc: end def default_layout(format) #:nodoc: - layout = read_inheritable_attribute(:layout) + layout = read_inheritable_attribute(:layout) unless format == :js return layout unless read_inheritable_attribute(:auto_layout) find_layout(layout, format) end |