From 5c4979ccf06e9a66c9f4ad4d7834a846b1849ed4 Mon Sep 17 00:00:00 2001 From: MrZYX Date: Mon, 28 Mar 2011 00:09:07 +0200 Subject: [PATCH] use explicit check in User#disconnect_everyone, the previous check failed in rarly weired situations, I can't tell why --- app/models/user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 269533f3d..2501b296f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -340,7 +340,7 @@ class User < ActiveRecord::Base def disconnect_everyone Contact.unscoped.where(:user_id => self.id).each { |contact| - if contact.person.owner_id + unless contact.person.owner.nil? contact.person.owner.disconnected_by self.person remove_contact(contact) else