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

app/controllers/publics_controller.rb

@@ -33,7 +33,9 @@ class PublicsController < ApplicationController
     render :nothing => true
     return unless params[:xml]
     begin
-      @user = Person.first(:id => params[:id]).owner
+      person = Person.first(:id => params[:id])
+      puts person.real_name
+      @user = person.owner
     rescue NoMethodError => e
       Rails.logger.error("Received post for nonexistent person #{params[:id]}")
       return

app/helpers/requests_helper.rb

@@ -33,6 +33,7 @@ module RequestsHelper
   def relationship_flow(identifier)
     action = :none
     person = nil
+    puts identifier
     person = Person.by_webfinger identifier
     if person
       action = (person == current_user.person ? :none : :friend)

db/seeds/tom.rb

@@ -7,7 +7,7 @@
 require 'config/environment'
 
 remote_url = "http://tom.joindiaspora.com/"
-remote_url = "http://localhost:3000/"
+#remote_url = "http://localhost:3000/"
 # Create seed user
 user = User.instantiate!( :email => "tom@tom.joindiaspora.com",
                      :username => "tom",