diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-08-30 20:47:01 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-08-30 20:52:08 -0300 |
| commit | e5f2b0d75f29cd7d9e11e8008d410caf48ab1078 (patch) | |
| tree | 5937f7c450ae15652b8fc0aa80445560bce6ec08 /actionpack/lib | |
| parent | 60d8e4ac28726d04d029b25cff82181a9b0ab5c3 (diff) | |
| download | rails-e5f2b0d75f29cd7d9e11e8008d410caf48ab1078.tar.gz rails-e5f2b0d75f29cd7d9e11e8008d410caf48ab1078.tar.bz2 rails-e5f2b0d75f29cd7d9e11e8008d410caf48ab1078.zip | |
Revert "Merge pull request #2647 from dmathieu/no_rescue"
This reverts commit 125b1b0b9180ec8f0135da185e77250d2b8a4bea.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/sprockets/helpers/rails_helper.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.rb index 7a2bf8bef6..062aa4dae5 100644 --- a/actionpack/lib/sprockets/helpers/rails_helper.rb +++ b/actionpack/lib/sprockets/helpers/rails_helper.rb @@ -58,8 +58,12 @@ module Sprockets private def debug_assets? - config = Rails.application.config.assets - config.allow_debugging && (config.debug || params[:debug_assets]) + begin + config = Rails.application.config.assets + config.allow_debugging && (config.debug || params[:debug_assets]) + rescue NoMethodError + false + end end # Override to specify an alternative prefix for asset path generation. |