Merged r9619 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@9620 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 5b1d681115cfbf1a597919a790c9fa5be96f8067..e3e67505a3f150c0b8ca54b8782a5b48d706e944 100644 (file)
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -141,7 +141,7 @@ class Repository < ActiveRecord::Base
     elsif repository.is_default?
       1
     else
-      identifier <=> repository.identifier
+      identifier.to_s <=> repository.identifier.to_s
     end
   end
 

diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb
index 1fe246d8e3f589f7619e413dff84aa2cb1e7cf3a..466babb3851d3e56541d60ed85be41b3ed9df752 100644 (file)
--- a/test/unit/repository_test.rb
+++ b/test/unit/repository_test.rb
@@ -318,4 +318,13 @@ class RepositoryTest < ActiveSupport::TestCase
     assert_equal "test_value_23",
                  repo.extra_info["test_2"]["test_23"]
   end
+
+  def test_sort_should_not_raise_an_error_with_nil_identifiers
+    r1 = Repository.new
+    r2 = Repository.new
+
+    assert_nothing_raised do
+      [r1, r2].sort
+    end
+  end
 end