From 749f7071f3307b6c243ae970add42d7d8123bab6 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 12 Dec 2016 15:23:52 -0500
Subject: [PATCH] FIX: `Object.assign` isn't available to phantom

---
 app/assets/javascripts/discourse/controllers/composer.js.es6 | 1 -
 app/assets/javascripts/discourse/helpers/raw.js.es6          | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index daab7d925a3..9a8aa809d29 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -267,7 +267,6 @@ export default Ember.Controller.extend({
     },
 
     showOptions(toolbarEvent, loc) {
-      console.log("opts", JSON.stringify(toolbarEvent.selected));
       this.set('toolbarEvent', toolbarEvent);
       this.appEvents.trigger('popup-menu:open', loc);
       this.set('optionsVisible', true);
diff --git a/app/assets/javascripts/discourse/helpers/raw.js.es6 b/app/assets/javascripts/discourse/helpers/raw.js.es6
index cda32f91a46..f40835035d4 100644
--- a/app/assets/javascripts/discourse/helpers/raw.js.es6
+++ b/app/assets/javascripts/discourse/helpers/raw.js.es6
@@ -3,7 +3,7 @@ import { registerUnbound } from 'discourse-common/lib/helpers';
 let _injections;
 
 function renderRaw(ctx, container, template, templateName, params) {
-  params = Object.assign({}, params);
+  params = jQuery.extend({}, params);
   params.parent = params.parent || ctx;
 
   if (!params.view) {