From 8bf872e92eb6497a277337a5da1e1a7510b3ab00 Mon Sep 17 00:00:00 2001 From: macournoyer Date: Wed, 5 Feb 2014 22:36:26 -0500 Subject: [PATCH] Fix shortenUrl helper to not crash when URL doesn't include any "/". --- .../javascripts/discourse/helpers/application_helpers.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/helpers/application_helpers.js b/app/assets/javascripts/discourse/helpers/application_helpers.js index da487600cbc..f9b408e5901 100644 --- a/app/assets/javascripts/discourse/helpers/application_helpers.js +++ b/app/assets/javascripts/discourse/helpers/application_helpers.js @@ -106,10 +106,11 @@ Handlebars.registerHelper('titledLinkTo', function(name, object) { @for Handlebars **/ Handlebars.registerHelper('shortenUrl', function(property, options) { - var url; + var url, matches; url = Ember.Handlebars.get(this, property, options); // Remove trailing slash if it's a top level URL - if (url.match(/\//g).length === 3) { + matches = url.match(/\//g); + if (matches && matches.length === 3) { url = url.replace(/\/$/, ''); } url = url.replace(/^https?:\/\//, '');