From 004e71a3fe295c8e147de5ccc944428d3abc8dcf Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 26 Oct 2016 16:26:10 -0400
Subject: [PATCH] FIX: Some errors that only appear in Ember 1.13

---
 app/assets/javascripts/discourse-common/lib/helpers.js.es6 | 7 +++++--
 .../discourse/controllers/discovery/categories.js.es6      | 5 ++++-
 .../javascripts/discourse/helpers/user-status.js.es6       | 4 ++--
 ...ured_topics.hbs => categories-with-featured-topics.hbs} | 0
 4 files changed, 11 insertions(+), 5 deletions(-)
 rename app/assets/javascripts/discourse/templates/components/{categories_with_featured_topics.hbs => categories-with-featured-topics.hbs} (100%)

diff --git a/app/assets/javascripts/discourse-common/lib/helpers.js.es6 b/app/assets/javascripts/discourse-common/lib/helpers.js.es6
index df588aa4a1..d65668bca3 100644
--- a/app/assets/javascripts/discourse-common/lib/helpers.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/helpers.js.es6
@@ -3,8 +3,11 @@ import { get } from 'discourse-common/lib/raw-handlebars';
 // `Ember.Helper` is only available in versions after 1.12
 export function htmlHelper(fn) {
   if (Ember.Helper) {
-    return Ember.Helper.helper(function() {
-      return new Handlebars.SafeString(fn.apply(this, Array.prototype.slice.call(arguments)) || '');
+    return Ember.Helper.helper(function(...args) {
+      if (args.length > 1) {
+        args[1] = { hash: args[1] };
+      }
+      return new Handlebars.SafeString(fn.apply(this, args) || '');
     });
   } else {
     return Ember.Handlebars.makeBoundHelper(function() {
diff --git a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
index 3fa74ca054..5b435b8d9a 100644
--- a/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
+++ b/app/assets/javascripts/discourse/controllers/discovery/categories.js.es6
@@ -20,7 +20,10 @@ export default DiscoveryController.extend({
   @computed("model.parentCategory")
   categoryPageStyle(parentCategory) {
     const style = this.siteSettings.desktop_category_page_style;
-    return parentCategory && style === "categories_and_latest_topics" ? "categories_only" : style;
+    const componentName = (parentCategory && style === "categories_and_latest_topics") ?
+                          "categories_only" :
+                          style;
+    return Ember.String.dasherize(componentName);
   }
 
 });
diff --git a/app/assets/javascripts/discourse/helpers/user-status.js.es6 b/app/assets/javascripts/discourse/helpers/user-status.js.es6
index 9240273d10..fb1a05efee 100644
--- a/app/assets/javascripts/discourse/helpers/user-status.js.es6
+++ b/app/assets/javascripts/discourse/helpers/user-status.js.es6
@@ -6,8 +6,8 @@ export default htmlHelper((user, args) => {
   if (!user) { return; }
 
   const name = escapeExpression(user.get('name'));
-  let currentUser = args.currentUser;
-  if (!currentUser && args.hash) {
+  let currentUser;
+  if (args && args.hash) {
     currentUser = args.hash.currentUser;
   }
 
diff --git a/app/assets/javascripts/discourse/templates/components/categories_with_featured_topics.hbs b/app/assets/javascripts/discourse/templates/components/categories-with-featured-topics.hbs
similarity index 100%
rename from app/assets/javascripts/discourse/templates/components/categories_with_featured_topics.hbs
rename to app/assets/javascripts/discourse/templates/components/categories-with-featured-topics.hbs