0
@@ -16,14 +16,13 @@ class PeopleController < ApplicationController
0
   
0
   def show
0
     @person = Person.find(params[:id], :include => :activities)
0
-    @contacts = @person.some_contacts
0
-    if logged_in?
0
-      @common_connections = current_person.common_connections_with(@person)
0
-    end
0
     if @person.deactivated?
0
       flash[:error] = "That person has been deactivated"
0
       redirect_to home_url and return
0
     end
0
+    if logged_in?
0
+      @common_connections = current_person.common_connections_with(@person)
0
+    end
0
     if current_person?(@person)
0
       link = edit_person_path(@person)
0
       flash.now[:notice] = %(You are viewing your own profile.
0
@@ -89,7 +88,7 @@ class PeopleController < ApplicationController
0
   end
0
 
0
   def update
0
-    @person = current_person
0
+    @person = Person.find(params[:id])
0
     respond_to do |format|
0
       case params[:type]
0
       when 'info_edit'