Skip to content
Browse files

Final occurances of 'filename' renamed to 'name'.

All remaining instances (e.g. early migrations) of the word 'filename' should stay as 'filename'.
  • Loading branch information...
1 parent c6cdcf8 commit 76909624f65a831f9554777dc8eaa313af12a60a @nelstrom committed Nov 9, 2008
Showing with 5 additions and 5 deletions.
  1. +5 −5 lib/site_controller_mixins.rb
View
10 lib/site_controller_mixins.rb
@@ -40,21 +40,21 @@ def parse_url_for_text_assets
end
- def show_text_asset(filename, asset_type)
+ def show_text_asset(name, asset_type)
response.headers.delete('Cache-Control')
- cache_url = "#{asset_type}_cache/#{filename}"
+ cache_url = "#{asset_type}_cache/#{name}"
if (request.get? || request.head?) and live? and (text_asset_cache.response_cached?(cache_url))
text_asset_cache.update_response(cache_url, response, request)
@performed_render = true
else
- show_uncached_text_asset(filename, asset_type, cache_url)
+ show_uncached_text_asset(name, asset_type, cache_url)
end
end
- def show_uncached_text_asset(filename, asset_type, cache_url)
- @text_asset = asset_type.camelcase.constantize.find_by_name(filename)
+ def show_uncached_text_asset(name, asset_type, cache_url)
+ @text_asset = asset_type.camelcase.constantize.find_by_name(name)
mime_type = Sns::Config["#{asset_type}_mime_type"]
unless @text_asset.nil?

0 comments on commit 7690962

Please sign in to comment.
Something went wrong with that request. Please try again.