From c835814ee199eadb19dae3fa53c1f58b98785d1d Mon Sep 17 00:00:00 2001 From: Guillermo Date: Mon, 27 Sep 2010 19:20:42 -0500 Subject: [PATCH] Merging prep_image_url with master --- app/controllers/users_controller.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 9fb2c2989..b5f352651 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -29,8 +29,11 @@ class UsersController < ApplicationController if params[:profile][:image_url].empty? params[:profile].delete(:image_url) else - url = APP_CONFIG[:pod_url].chop if APP_CONFIG[:pod_url][-1,1] == '/' - params[:profile][:image_url] = url + params[:profile][:image_url] if params[:profile][:image_url].at(0) == '/' + if /^http:\/\// =~ 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