diff --git a/lib/adminlib.php b/lib/adminlib.php
index 2c7324496af..a3f50bfc475 100644
--- 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 = '
'.print_textarea($CFG->adminusehtmleditor, 15, 60, 0, 0, $this->get_full_name(), $data, 0, true, 'summary') .'
';
diff --git a/lib/form/htmleditor.php b/lib/form/htmleditor.php
index a0b5b6f4c2b..a697aef16f8 100644
--- 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 aa1d5bf048e..e95102e8af7 100644
--- 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 .= ''."\n";
if ($usehtmleditor) {
- $str_save = "alert('fdsalkjfdsa')";
$str_toggle = '
';
// Show shortcuts button if HTML editor is in use, but only if JavaScript is enabled (MDL-9556)
$str .= '';