Permalink
Browse files

Revert "Merge pull request #2647 from dmathieu/no_rescue"

This reverts commit 125b1b0.
  • Loading branch information...
spastorino committed Aug 30, 2011
1 parent aa94342 commit 69c7213eb4a7176693e49c0463e331e94d996ad3
Showing with 9 additions and 9 deletions.
  1. +8 −4 actionpack/lib/sprockets/helpers/rails_helper.rb
  2. +1 −5 actionpack/test/abstract_unit.rb
@@ -72,10 +72,14 @@ def asset_path(source, default_ext = nil, body = false, protocol = nil)
private
def debug_assets?
- Rails.application.config.assets.compile &&
- (Rails.application.config.assets.debug ||
- params[:debug_assets] == '1' ||
- params[:debug_assets] == 'true')
+ begin
+ Rails.application.config.assets.compile &&
+ (Rails.application.config.assets.debug ||
+ params[:debug_assets] == '1' ||
+ params[:debug_assets] == 'true')
+ rescue NoMethodError
+ false
+ end
end
# Override to specify an alternative prefix for asset path generation.
@@ -142,11 +142,7 @@ def call(env)
end
class BasicController
- attr_accessor :request, :params
-
- def initialize
- @params = {}
- end
+ attr_accessor :request
def config
@config ||= ActiveSupport::InheritableOptions.new(ActionController::Base.config).tap do |config|

0 comments on commit 69c7213

Please sign in to comment.