diff --git a/app/assets/javascripts/discourse.js b/app/assets/javascripts/discourse.js
index 6a234d3ed..2bddc91c2 100644
--- a/app/assets/javascripts/discourse.js
+++ b/app/assets/javascripts/discourse.js
@@ -11,28 +11,23 @@ window.Discourse = Ember.Application.createWithMixins(Discourse.Ajax, {
   _docTitle: document.title,
 
   getURL: function(url) {
-    if (!url) { return url; }
+    if (!url) return url;
 
-    // If it's a non relative URL, return it.
-    if (url.indexOf('http') === 0) return url;
+    // if it's a non relative URL, return it.
+    if (!/^\/[^\/]/.test(url)) return url;
 
     var u = (Discourse.BaseUri === undefined ? "/" : Discourse.BaseUri);
-    if (u[u.length-1] === '/') {
-      u = u.substring(0, u.length-1);
-    }
-    if (url.indexOf(u) !== -1) return url;
 
-    if(u.length > 0  && url[0] !== "/") {
-      // we got to root this
-      url = "/" + url;
-    }
+    if (u[u.length-1] === '/') u = u.substring(0, u.length-1);
+    if (url.indexOf(u) !== -1) return url;
+    if (u.length > 0  && url[0] !== "/") url = "/" + url;
 
     return u + url;
   },
 
   getURLWithCDN: function(url) {
     url = this.getURL(url);
-    // https:// and http:// and // should be skipped, only /xyz is allowed here
+    // only relative urls
     if (Discourse.CDN && /^\/[^\/]/.test(url)) {
       url = Discourse.CDN + url;
     } else if (Discourse.S3CDN) {