aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYehuda Katz <wycats@yehuda-katzs-macbookpro41.local>2009-06-23 14:04:04 -0700
committerYehuda Katz <wycats@yehuda-katzs-macbookpro41.local>2009-06-23 14:06:22 -0700
commit4417a19b035d73eb46a5e06e296a4b1c8091bef1 (patch)
treed3b6c5e5000803aaebc8031c06579f3e21299b34
parent80f1f863cd0f9cba89079511282de5710a2e1832 (diff)
downloadrails-4417a19b035d73eb46a5e06e296a4b1c8091bef1.tar.gz
rails-4417a19b035d73eb46a5e06e296a4b1c8091bef1.tar.bz2
rails-4417a19b035d73eb46a5e06e296a4b1c8091bef1.zip
Small changes to get 1.9 passing (for the most part)
-rw-r--r--actionpack/lib/action_controller/base/http.rb2
-rw-r--r--actionpack/lib/action_dispatch/http/mime_type.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base/http.rb b/actionpack/lib/action_controller/base/http.rb
index 2e73561f93..ec78bc15a8 100644
--- a/actionpack/lib/action_controller/base/http.rb
+++ b/actionpack/lib/action_controller/base/http.rb
@@ -36,7 +36,7 @@ module ActionController
# ==== Returns
# String
def self.controller_path
- @controller_path ||= self.name.sub(/Controller$/, '').underscore
+ @controller_path ||= name && name.sub(/Controller$/, '').underscore
end
# Delegates to the class' #controller_path
diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb
index dda6604bdd..27f27e27fe 100644
--- a/actionpack/lib/action_dispatch/http/mime_type.rb
+++ b/actionpack/lib/action_dispatch/http/mime_type.rb
@@ -10,7 +10,7 @@ module Mime
%w(<< concat shift unshift push pop []= clear compact! collect!
delete delete_at delete_if flatten! map! insert reject! reverse!
replace slice! sort! uniq!).each do |method|
- define_method(method) { @symbols = nil; super }
+ define_method(method) {|*args| @symbols = nil; super(*args) }
end
end