From a3b85d7b8560cdc1057fcaffa3acbd247b4b5b7a Mon Sep 17 00:00:00 2001
From: Thomas B. <thomas@roundcube.net>
Date: Mon, 07 Oct 2013 13:19:03 -0400
Subject: [PATCH] Merge pull request #133 from cwickert/release-0.9-canned-responses

---
 program/js/tiny_mce/plugins/legacyoutput/editor_plugin_src.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/program/js/tiny_mce/plugins/legacyoutput/editor_plugin_src.js b/program/js/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
index e627ec7..3cdcde5 100644
--- a/program/js/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
+++ b/program/js/tiny_mce/plugins/legacyoutput/editor_plugin_src.js
@@ -68,7 +68,7 @@
 					},
 
 					// Setup font elements for colors as well
-					forecolor : {inline : 'font', styles : {color : '%value'}},
+					forecolor : {inline : 'font', attributes : {color : '%value'}},
 					hilitecolor : {inline : 'font', styles : {backgroundColor : '%value'}}
 				});
 

--
Gitblit v1.9.1