MDL-14741: cleaning up some leftover cruft

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 2c7324496affd2010d95a1ed02b04f123e1456c7..a3f50bfc475015061b46495cde465f600eb3e227 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -2836,7 +2836,7 @@ class admin_setting_special_frontpagedesc extends admin_setting {
     }
 
     function output_html($data, $query='') {
-        global $CFG, $htmlEditorObject;
+        global $CFG;
 
         $CFG->adminusehtmleditor = can_use_html_editor();
         $return = '<div class="form-htmlarea">'.print_textarea($CFG->adminusehtmleditor, 15, 60, 0, 0, $this->get_full_name(), $data, 0, true, 'summary') .'</div>';

diff --git a/lib/form/htmleditor.php b/lib/form/htmleditor.php
index a0b5b6f4c2b6ccc2bc6f52ac00eb72aeff25f9f7..a697aef16f8dbdb857fa77f30a7b068dbc7e7a17 100644 (file)
--- a/lib/form/htmleditor.php
+++ b/lib/form/htmleditor.php
@@ -61,8 +61,6 @@ class MoodleQuickForm_htmleditor extends MoodleQuickForm_textarea{
 
     function toHtml(){
         //if ($this->_canUseHtmlEditor && !$this->_flagFrozen){
-            //global $htmlEditorObject;
-            //$script = $htmlEditorObject->activateEditor($this->getName(), $this->getAttribute('id'));
         //    $script = '';
         //} else {
         //    $script='';

diff --git a/lib/weblib.php b/lib/weblib.php
index aa1d5bf048e4aeaa9f24edd8dd17e4cb69f3a0d4..e95102e8af78718d9dec0758291990f8121f9e73 100644 (file)
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -2544,7 +2544,6 @@ function print_header ($title='', $heading='', $navigation='', $focus='',
     $bodytags .= ' class="'.$pageclass.'" id="'.$pageid.'"';
 
     require_once($CFG->libdir .'/editor/htmlEditor.class.php');
-    global $htmlEditorObject;
     $htmlEditorObject = new htmlEditor();
     $htmlEditor = $htmlEditorObject->configure(NULL, $COURSE->id);
 
@@ -4870,7 +4869,6 @@ function print_textarea($usehtmleditor, $rows, $cols, $width, $height, $name, $v
     $str .= '</textarea>'."\n";
 
     if ($usehtmleditor) {
-        $str_save = "alert('fdsalkjfdsa')";
         $str_toggle = '<span class="helplink"><a href="javascript:mce_toggleEditor(\''. $id .'\');"><img width="50" height="17" src="'. $CFG->httpswwwroot .'/lib/editor/tinymce/images/toggle.gif" alt="'. get_string('editortoggle') .'" title="'. get_string('editortoggle') .'" class="icontoggle" /></a></span>';
         // Show shortcuts button if HTML editor is in use, but only if JavaScript is enabled (MDL-9556)
         $str .= '<div class="textareaicons">';