nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Sarah Mei 2011-09-08 12:01:55 -07:00
commit c72ee05ca1
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/job/http_multi.rb
View file

@ -14,7 +14,9 @@ module Job
OPTS = {:max_redirects => 3, :timeout => 5000, :method => :post} OPTS = {:max_redirects => 3, :timeout => 5000, :method => :post}
def self.perform(user_id, enc_object_xml, person_ids, retry_count=0) def self.perform(user_id, enc_object_xml, person_ids, retry_count=0)
return true if user_id == '91842' #NOTE 09/08/11 blocking diapsorahqposts
user = User.find(user_id) user = User.find(user_id)
people = Person.where(:id => person_ids) people = Person.where(:id => person_ids)
salmon = Salmon::SalmonSlap.create(user, Base64.decode64(enc_object_xml)) salmon = Salmon::SalmonSlap.create(user, Base64.decode64(enc_object_xml))