diff options
| author | Daniel Vincent Grippi <Dan@SPEEDRACER.local> | 2010-09-14 22:43:03 +0400 |
|---|---|---|
| committer | Daniel Vincent Grippi <Dan@SPEEDRACER.local> | 2010-09-14 22:43:03 +0400 |
| commit | be7c3f28a93313bb7a7cc46f250ef1a770742348 (patch) | |
| tree | cf979937c8ae46d2d7f698d0781771330efd8b73 /app | |
| parent | 71ef54dbcc2ff03a3ba742af27245474866a48e6 (diff) | |
| parent | cb12e497f6cb3618bb8a336bd7a47f19e492dc74 (diff) | |
Merge branch 'master' of github.com:diaspora/diaspora
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/person.rb | 2 | ||||
| -rw-r--r-- | app/views/publics/webfinger.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/person.rb b/app/models/person.rb index b85b98264..b9fd85cc0 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -102,7 +102,7 @@ class Person rescue SocketError => e raise "Diaspora server for #{identifier} not found" if e.message =~ /Name or service not known/ end - raise "No diaspora user found at #{identifier}" unless f + raise "No webfinger profile found at #{identifier}" unless f Person.from_webfinger_profile(identifier, f ) end end diff --git a/app/views/publics/webfinger.erb b/app/views/publics/webfinger.erb index ab3e35087..f695c4c97 100644 --- a/app/views/publics/webfinger.erb +++ b/app/views/publics/webfinger.erb @@ -2,7 +2,7 @@ <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"> <Subject>acct:<%=@person.email%></Subject> <Alias>"<%= @person.url %>"</Alias> - <Link rel="http://microformats.org/profile/hcard" type="text/html" href="<%=@person.url%>/hcard/users/<%=@person.id%>"/> + <Link rel="http://microformats.org/profile/hcard" type="text/html" href="<%=@person.url%>hcard/users/<%=@person.id%>"/> <Link rel="http://joindiaspora.com/seed_location" type = 'text/html' href="<%=@person.url%>"/> <Link rel="http://joindiaspora.com/guid" type = 'text/html' href="<%=@person.id%>"/> <Link rel="diaspora-public-key" type = 'RSA' href="<%=Base64.encode64(@person.exported_key)%>"/> |