diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-08-25 11:05:57 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-08-25 11:05:57 -0700 |
| commit | df948f3100b0a4c87801da6f819d7ebebb847aff (patch) | |
| tree | f661be6f1bc4c89d938944c81424c4c49ee6cedc /actionpack | |
| parent | 35f3907f349422b12abff3b42e22795743168f44 (diff) | |
| parent | b59aa358bb311d3d06c5df856a1d57124b857d5a (diff) | |
| download | rails-df948f3100b0a4c87801da6f819d7ebebb847aff.tar.gz rails-df948f3100b0a4c87801da6f819d7ebebb847aff.tar.bz2 rails-df948f3100b0a4c87801da6f819d7ebebb847aff.zip | |
Merge pull request #2690 from dasch/pretty-debug-assets
Make Sprockets::Helpers::RailsHelper#debug_assets? more readable
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index 53cc5ec019..bc1ab3c52a 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -58,10 +58,10 @@ module Sprockets private def debug_assets? - Rails.application.config.assets.allow_debugging && - (Rails.application.config.assets.debug || - params[:debug_assets] == '1' || - params[:debug_assets] == 'true') + config = Rails.application.config.assets + param = params[:debug_assets] + + config.allow_debugging && (config.debug || param == '1' || param == 'true') end # Override to specify an alternative prefix for asset path generation. |