Merge pull request #4567 from toumou/master

FIX uploadLocation when window.location.port is empty
2016-12-01 07:19:24 +01:00 · 2016-12-01 07:19:24 +01:00 · e0803e1f91
parent 6b4ef86ac4 c39121eae0
commit e0803e1f91
1 changed files with 1 additions and 1 deletions
--- a/app/assets/javascripts/discourse/lib/utilities.js.es6
+++ b/app/assets/javascripts/discourse/lib/utilities.js.es6
@ -234,7 +234,7 @@ export function uploadLocation(url) {
  } else {
    var protocol = window.location.protocol + '//',
      hostname = window.location.hostname,
-      port = ':' + window.location.port;
+      port = window.location.port ? ':' + window.location.port : '';
    return protocol + hostname + port + url;
  }
 }