From 33325c089286748669e599eee3c03fbd9c333555 Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Mon, 4 Mar 2013 12:30:15 -0800
Subject: [PATCH] Tinymce now checks for templates in THEME folder.

---
 e107_plugins/tinymce/wysiwyg.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/e107_plugins/tinymce/wysiwyg.php b/e107_plugins/tinymce/wysiwyg.php
index b9a2d8b0f..bf22d55af 100644
--- a/e107_plugins/tinymce/wysiwyg.php
+++ b/e107_plugins/tinymce/wysiwyg.php
@@ -230,7 +230,8 @@ class wysiwyg
 			$template = "public.xml";			
 		}
 		
-		$config = e107::getXml()->loadXMLfile(e_PLUGIN."tinymce/templates/".$template,true); //TODO System and theme folder checks for overrides. 
+		$configPath = (is_readable(THEME."templates/tinymce/".$template)) ? THEME."templates/tinymce/".$template : e_PLUGIN."tinymce/templates/".$template;
+		$config 	= e107::getXml()->loadXMLfile($configPath, true); 
 
 
 		//TODO Cache!