Download as
Browse Code »

Commit d4726a4ea46706c1e5504e5f22fc916a4c97edf6

Authored by Weblate
2 parents 463096eb b811e582
Exists in master and in 27 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, tests, tests_fixies

Merge remote-tracking branch 'origin/master'

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
app/controllers/public/chat_controller.rb
  Diff comments   View file @d4726a4
@@ -19,7 +19,7 @@ class ChatController < PublicController @@ -19,7 +19,7 @@ class ChatController < PublicController
19 def avatar 19 def avatar
20 profile = environment.profiles.find_by_identifier(params[:id]) 20 profile = environment.profiles.find_by_identifier(params[:id])
21 filename, mimetype = profile_icon(profile, :minor, true) 21 filename, mimetype = profile_icon(profile, :minor, true)
22 - if filename =~ /^https?:/ 22 + if filename =~ /^(https?:)?\/\//
23 redirect_to filename 23 redirect_to filename
24 else 24 else
25 data = File.read(File.join(Rails.root, 'public', filename)) 25 data = File.read(File.join(Rails.root, 'public', filename))