From c020cec265e80a36074de576b679ca1b72363499 Mon Sep 17 00:00:00 2001 From: scyrma Date: Fri, 20 Jun 2008 09:31:19 +0000 Subject: [PATCH] MDL-14741: use the value of the main killswitch, and add back missing functions --- lib/editor/htmlEditor.class.php | 4 ++++ lib/editor/tinymce.js.php | 17 ++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/lib/editor/htmlEditor.class.php b/lib/editor/htmlEditor.class.php index 1466301199..385277005f 100644 --- a/lib/editor/htmlEditor.class.php +++ b/lib/editor/htmlEditor.class.php @@ -19,6 +19,10 @@ class htmlEditor { global $CFG; static $configured = Array(); + if (!$CFG->htmleditor) { + return; + } + if ($editor == '') { $editor = (isset($CFG->defaulthtmleditor) ? $CFG->defaulthtmleditor : ''); } diff --git a/lib/editor/tinymce.js.php b/lib/editor/tinymce.js.php index b9957c93ed..4221831ceb 100644 --- a/lib/editor/tinymce.js.php +++ b/lib/editor/tinymce.js.php @@ -110,7 +110,7 @@ function createHTMLArea(id) { elements : id, theme : "advanced", - plugins : "safari,spellchecker,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,pagebreak,imagemanager,filemanager", + plugins : "safari,spellchecker,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,pagebreak,", spellchecker_languages : "+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv", plugin_insertdate_dateFormat : "%Y-%m-%d", @@ -180,6 +180,7 @@ echo <<httpswwwroot}/lib/editor/tinymce/jscripts/tiny_mce/plugins/moodlelink/link.php?id={$COURSE->id}", + width: 480, + height: 380, + resizable: "yes", + inline: "yes", + close_previous: "no" + }, { + window: win, + input: field_name + }); + return false; + } EOF; ?> -- 2.39.5