Merge remote-tracking branch 'origin/master'

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