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

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

Browse source
This commit is contained in:
Raphael 2010-09-27 14:48:11 -07:00
commit 12bd0f2301
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/users_controller.rb
View file

@ -26,11 +26,15 @@ class UsersController < ApplicationController
private private
def prep_image_url(params) def prep_image_url(params)
url = APP_CONFIG[:pod_url].chop if APP_CONFIG[:pod_url][-1,1] == '/'
if params[:profile][:image_url].empty? if params[:profile][:image_url].empty?
params[:profile].delete(:image_url) params[:profile].delete(:image_url)
else else
url = APP_CONFIG[:pod_url].chop if APP_CONFIG[:pod_url][-1,1] == '/' if /^http:\/\// =~ params[:profile][:image_url]
params[:profile][:image_url] = url + params[:profile][:image_url] params[:profile][:image_url] = params[:profile][:image_url]
else
params[:profile][:image_url] = url + params[:profile][:image_url]
end
end end
end end