From 875703a750f11e1006d1966e443926987b68ab95 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Wed, 9 Nov 2016 11:46:11 -0500
Subject: [PATCH] A couple of small but important fixes for later Ember
 releases

---
 app/assets/javascripts/admin/templates/plugins-index.hbs | 2 +-
 .../discourse-common/lib/buffered-render.js.es6          | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/plugins-index.hbs b/app/assets/javascripts/admin/templates/plugins-index.hbs
index 34bf63c756e..b7d64f2a346 100644
--- a/app/assets/javascripts/admin/templates/plugins-index.hbs
+++ b/app/assets/javascripts/admin/templates/plugins-index.hbs
@@ -1,4 +1,4 @@
-{{#if length}}
+{{#if model.length}}
 
   {{#if currentUser.admin}}
     {{d-button label="admin.plugins.change_settings"
diff --git a/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6 b/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6
index 4873bfc7786..c1eebb77682 100644
--- a/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6
+++ b/app/assets/javascripts/discourse-common/lib/buffered-render.js.es6
@@ -25,13 +25,18 @@ export function bufferedRender(obj) {
     return obj;
   }
 
-  const caller = {};
+  const caller = {
+    _didRender: false
+  };
 
   // True in 1.13 or greater
   if (Ember.Helper) {
     caller.didRender = function() {
       this._super();
-      this._customRender();
+      if (!this._didRender) {
+        this._customRender();
+      }
+      this._didRender = true;
     };
   } else {
     caller.didInsertElement = function() {