MDL-14741 - Prevent installation problem, preventing use of html on first-time config...

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 3f5791cafd9ba6c8b94eef2f758fdcdf3b7ae08a..24e694fb67cf5f742a80246c7268ec098969c089 100644 (file)
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -2633,7 +2633,11 @@ class admin_setting_special_frontpagedesc extends admin_setting {
         global $CFG, $htmlEditorObject;
 
         $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'). print($htmlEditorObject->activateEditor($this->get_full_name, 'summary')) .'</div>';
+        $return = '<div class="form-htmlarea">'.print_textarea($CFG->adminusehtmleditor, 15, 60, 0, 0, $this->get_full_name(), $data, 0, true, 'summary');
+        if ($CFG->adminusehtmleditor && !is_null($htmlEditorObject)) {
+            $return .= $htmlEditorObject->activateEditor($this->get_full_name, 'summary');
+        }
+        $return .= '</div>';
 
         return format_admin_setting($this, $this->visiblename, $return, $this->description, false, '', NULL, $query);
     }