From aad0e73feafec2dea308e191e7683b3ff81a81ab Mon Sep 17 00:00:00 2001
From: Steve Temple <steve@gibedigital.com>
Date: Fri, 31 Jan 2014 23:18:49 +0000
Subject: [PATCH] Add customConfig back into rte

---
 .../src/views/propertyeditors/rte/rte.controller.js           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 1754584a9d..5928778c62 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -71,7 +71,7 @@ angular.module("umbraco")
                     //the elements needed
                     $timeout(function () {
                         tinymce.DOM.events.domLoaded = true;
-                        tinymce.init({
+                        tinymce.init(angular.extend({
                             mode: "exact",
                             elements: $scope.model.alias + "_rte",
                             skin: "umbraco",
@@ -124,7 +124,7 @@ angular.module("umbraco")
                                 //Create the insert macro plugin
                                 tinyMceService.createInsertMacro(editor, $scope);
                             }
-                        });
+                        }, tinyMceConfig.customConfig));
                     }, 200);
                 }