From 5febbd58cca02e7627b117d5f29c444996035786 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 3 Nov 2016 14:52:14 -0400
Subject: [PATCH] The initializer arguments changed in future Ember releases

---
 app/assets/javascripts/discourse.js.es6 | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse.js.es6 b/app/assets/javascripts/discourse.js.es6
index cbbc0bf9cfe..9012e8301b2 100644
--- a/app/assets/javascripts/discourse.js.es6
+++ b/app/assets/javascripts/discourse.js.es6
@@ -104,7 +104,14 @@ const Discourse = Ember.Application.extend({
       if (/\/pre\-initializers\//.test(key)) {
         const module = require(key, null, null, true);
         if (!module) { throw new Error(key + ' must export an initializer.'); }
-        Discourse.initializer(module.default);
+
+        const init = module.default;
+        const oldInitialize = init.initialize;
+        init.initialize = function() {
+          oldInitialize.call(this, Discourse.__container__, Discourse);
+        };
+
+        Discourse.initializer(init);
       }
     });
 
@@ -115,8 +122,8 @@ const Discourse = Ember.Application.extend({
 
         const init = module.default;
         const oldInitialize = init.initialize;
-        init.initialize = function(app) {
-          oldInitialize.call(this, app.container, Discourse);
+        init.initialize = function() {
+          oldInitialize.call(this, Discourse.__container__, Discourse);
         };
 
         Discourse.instanceInitializer(init);