diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-05 17:34:14 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-05 17:34:14 -0700 |
| commit | 9c9da5d927a1401bde9e96879c6117fb22210a09 (patch) | |
| tree | 435d778caaa95416c5f90e3f38efbce47fd8df6c /actionpack/lib/action_view/base.rb | |
| parent | e7f1556d0e75c635212273cc5e3cfd113456ff29 (diff) | |
| parent | 1dbfe9766e00282c56523f6969550494bbffbbf4 (diff) | |
| download | rails-9c9da5d927a1401bde9e96879c6117fb22210a09.tar.gz rails-9c9da5d927a1401bde9e96879c6117fb22210a09.tar.bz2 rails-9c9da5d927a1401bde9e96879c6117fb22210a09.zip | |
Merge branch 'master' into erbout
Diffstat (limited to 'actionpack/lib/action_view/base.rb')
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index ad114acc6c..eeebf335dc 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -252,6 +252,7 @@ If you are rendering a subtemplate, you must now use controller-like partial syn elsif options == :update update_page(&block) elsif options.is_a?(Hash) + use_full_path = options[:use_full_path] options = options.reverse_merge(:locals => {}, :use_full_path => true) if partial_layout = options.delete(:layout) @@ -265,7 +266,7 @@ If you are rendering a subtemplate, you must now use controller-like partial syn end end elsif options[:file] - render_file(options[:file], options[:use_full_path], options[:locals]) + render_file(options[:file], use_full_path || false, options[:locals]) elsif options[:partial] && options[:collection] render_partial_collection(options[:partial], options[:collection], options[:spacer_template], options[:locals]) elsif options[:partial] |