Merge branch 'master' of github.com:diaspora/diaspora_rails

2010-06-29 20:56:51 -07:00 · 2010-06-29 20:56:51 -07:00 · 70ece3c180
commit 70ece3c180
parent e159b8f7f4 fcbe8e42a0
2 changed files with 2 additions and 2 deletions
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -29,7 +29,7 @@ module ApplicationHelper
    when "User"
      user_path(person)
    else
-      link_to "unknown person", "#"
+      "unknown person"
    end
  end

--- a/app/models/person.rb
+++ b/app/models/person.rb
@ -26,7 +26,7 @@ class Person
  before_validation :clean_url
 
  def real_name
-    profile.first_name + " " + profile.last_name
+    profile.first_name.to_s + " " + profile.last_name.to_s
  end