Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

pass host_with_port to files_host

test plan:
 * download a file

Change-Id: I9a90d05a900d5a9eed730ca93155eb0760079eba
Reviewed-on: https://gerrit.instructure.com/10244
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Hudson <hudson@instructure.com>
  • Loading branch information...
commit a8e985300d99d1eccf686a60533f2aa2d60e8488 1 parent 38c8ea0
@ccutrer ccutrer authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 app/controllers/files_controller.rb
View
4 app/controllers/files_controller.rb
@@ -277,8 +277,8 @@ def show_relative
# a canvas URL are at least on a separate subdomain and the javascript
# won't be able to access or update data with AJAX requests.
def safer_domain_available?
- if !@files_domain && request.host_with_port != HostUrl.file_host(@domain_root_account, request.host)
- @safer_domain_host = HostUrl.file_host(@domain_root_account, request.host)
+ if !@files_domain && request.host_with_port != HostUrl.file_host(@domain_root_account, request.host_with_port)
+ @safer_domain_host = HostUrl.file_host(@domain_root_account, request.host_with_port)
end
!!@safer_domain_host
end
Please sign in to comment.
Something went wrong with that request. Please try again.