Fixed UrlHelper#link_to_unless so it doesn't care if the id is a string or fixnum [zenspider]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@256 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

4 files changed, 11 insertions, 5 deletions

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 705cda5f4a..0a873110f5 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed UrlHelper#link_to_unless so it doesn't care if the id is a string or fixnum [zenspider]
+
 * Added search through session to clear out association caches at the end of each request. This makes it possible to place Active Record objects
   in the session without worrying about stale data in the associations (the main object is still subject to caching, naturally) #347 [Tobias Luetke]
 
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
diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb
index 61b642a19e..9de510d0a4 100644
--- a/actionpack/test/template/url_helper_test.rb
+++ b/actionpack/test/template/url_helper_test.rb
@@ -43,6 +43,9 @@ class UrlHelperTest < Test::Unit::TestCase
     @params = { "controller" => "weblog", "action" => "show"}
     assert_equal "Showing", link_to_unless_current("Showing", :action => "show", :controller => "weblog")
     assert "<a href=\"http://www.world.com\">Listing</a>", link_to_unless_current("Listing", :action => "list", :controller => "weblog")
+
+    @params = { "controller" => "weblog", "action" => "show", "id" => "1"}
+    assert_equal "Showing", link_to_unless_current("Showing", :action => "show", :controller => "weblog", :id => 1)
   end
 
   def test_mail_to
@@ -58,4 +61,4 @@ class UrlHelperTest < Test::Unit::TestCase
       assert "<a href=\"http://www.world.com\">Hello</a>", 
         link_to("Hello", {:action => 'myaction'}, nil)
   end
-end
\ No newline at end of file
+end