github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-25 06:18:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

r2829@asus: jeremy | 2005-07-04 23:31:55 -0700

Browse Source 
cache protected_instance_variables


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1690 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper
2005-07-05 01:31:03 +00:00
parent d2b9e39c85
commit fa158ff07a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
actionpack/lib/action_controller/base.rb
View File

@@ -329,7 +329,7 @@ module ActionController #:nodoc:
# and find templates in /code/weblog/components/admin/parties/users/
def uses_component_template_root
path_of_calling_controller = File.dirname(caller[0].split(/:\d+:/).first)
path_of_controller_root = path_of_calling_controller.sub(/#{controller_path.split("/")[0..-2]}$/, "")
path_of_controller_root = path_of_calling_controller.sub(/#{controller_path.split("/")[0..-2]}$/, "") # " (for ruby-mode)
self.template_root = path_of_controller_root
end
@@ -663,9 +663,9 @@ module ActionController #:nodoc:
end
def add_instance_variables_to_assigns
protected_variables_cache = protected_instance_variables
@@protected_variables_cache = protected_instance_variables.inject({}) { |h, k| h[k] = true; h }
instance_variables.each do |var|
next if protected_variables_cache.include?(var)
next if @@protected_variables_cache.include?(var)
@assigns[var[1..-1]] = instance_variable_get(var)
end
end