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

This reverts commit 125b1b0.
rails · Aug 30, 2011 · 69c7213 · 69c7213
1 parent aa94342
commit 69c7213
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/actionpack/lib/sprockets/helpers/rails_helper.rb b/actionpack/lib/sprockets/helpers/rails_helper.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 &&
+        begin
-         (Rails.application.config.assets.debug ||
+          Rails.application.config.assets.compile &&
-          params[:debug_assets] == '1' ||
+            (Rails.application.config.assets.debug ||
-          params[:debug_assets] == 'true')
+             params[:debug_assets] == '1' ||
+             params[:debug_assets] == 'true')
+        rescue NoMethodError
+          false
+        end
       end
 
       # Override to specify an alternative prefix for asset path generation.

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
@@ -142,11 +142,7 @@ def call(env)
 end
 
 class BasicController
-  attr_accessor :request, :params
+  attr_accessor :request
-
-  def initialize
-    @params = {}
-  end
 
   def config
     @config ||= ActiveSupport::InheritableOptions.new(ActionController::Base.config).tap do |config|