refs #1742 : modified - confliction between modern and tinyMCE editor.

-
Needlworks · Jan 12, 2015 · ca80aeb · ca80aeb
1 parent 32c2278
commit ca80aeb
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/plugins/FM_Modern/index.php b/plugins/FM_Modern/index.php
@@ -40,10 +40,12 @@ function FM_Modern_editorinit($editor) {
 
 function FM_Modern_adminheader($target, $mother) {
 	global $suri, $pluginURL;
-
-	if ($suri['directive'] == '/owner/entry/post' || $suri['directive'] == '/owner/entry/edit') {
-		$target .= "\t<link rel=\"stylesheet\" media=\"screen\" type=\"text/css\" href=\"$pluginURL/editor.css\" />\n";
-		$target .= "\t<script type=\"text/javascript\" src=\"$pluginURL/editor.js\"></script>\n";
+    $context = Model_Context::getInstance();
+	if ($context->getProperty('editor.key') == 'modern') {
+		if ($suri['directive'] == '/owner/entry/post' || $suri['directive'] == '/owner/entry/edit') {
+			$target .= "\t<link rel=\"stylesheet\" media=\"screen\" type=\"text/css\" href=\"$pluginURL/editor.css\" />\n";
+			$target .= "\t<script type=\"text/javascript\" src=\"$pluginURL/editor.js\"></script>\n";
+		}
 	}
 	return $target;
 }