aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-rw-r--r--actionpack/lib/action_view/helpers/tag_helper.rb1
-rw-r--r--actionpack/lib/action_view/helpers/url_helper.rb8
2 files changed, 5 insertions, 4 deletions
diff --git a/actionpack/lib/action_view/helpers/tag_helper.rb b/actionpack/lib/action_view/helpers/tag_helper.rb
index bf81d5d909..e7c74bc958 100644
--- a/actionpack/lib/action_view/helpers/tag_helper.rb
+++ b/actionpack/lib/action_view/helpers/tag_helper.rb
@@ -1,4 +1,5 @@
require 'cgi'
+require 'erb'
module ActionView
module Helpers
diff --git a/actionpack/lib/action_view/helpers/url_helper.rb b/actionpack/lib/action_view/helpers/url_helper.rb
index 127c7a42d5..098fce8100 100644
--- a/actionpack/lib/action_view/helpers/url_helper.rb
+++ b/actionpack/lib/action_view/helpers/url_helper.rb
@@ -96,9 +96,9 @@ module ActionView
def destination_equal_to_current(options)
params_without_location = @params.reject { |key, value| %w( controller action id ).include?(key) }
- options[:action] == @params['action'] &&
- options[:id] == @params['id'] &&
- options[:controller] == @params['controller'] &&
+ options[:action].to_s == @params['action'].to_s &&
+ options[:id].to_s == @params['id'].to_s &&
+ options[:controller].to_s == @params['controller'].to_s &&
(options.has_key?(:params) ? params_without_location == options[:params] : true)
end
@@ -120,4 +120,4 @@ module ActionView
end
end
end
-end \ No newline at end of file
+end