diff --git a/app/controllers/profile_controller.rb b/app/controllers/profile_controller.rb index 95f07f26e4f..3929633558c 100644 --- a/app/controllers/profile_controller.rb +++ b/app/controllers/profile_controller.rb @@ -137,7 +137,7 @@ class ProfileController < ApplicationController data = JSON.parse(Net::HTTP.get(url)) rescue nil if data @pics << { - :url => data['profile_image_url'], + :url => data['profile_image_url_https'], :type => 'twitter', :alt => 'twitter pic' } diff --git a/app/models/user.rb b/app/models/user.rb index 430b835b23d..a1ed74abac9 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -920,7 +920,7 @@ class User < ActiveRecord::Base url = URI.parse("http://twitter.com/users/show.json?user_id=#{twitter.service_user_id}") data = JSON.parse(Net::HTTP.get(url)) rescue nil if data - self.avatar_image_url = data['profile_image_url'] || self.avatar_image_url + self.avatar_image_url = data['profile_image_url_https'] || self.avatar_image_url self.avatar_image_updated_at = Time.now end end @@ -958,7 +958,7 @@ class User < ActiveRecord::Base data = JSON.parse(Net::HTTP.get(url)) rescue nil if data self.avatar_image_source = 'twitter' - self.avatar_image_url = data['profile_image_url'] || self.avatar_image_url + self.avatar_image_url = data['profile_image_url_https'] || self.avatar_image_url self.avatar_image_updated_at = Time.now self.avatar_state = 'submitted' end