MDL-16318: remove a few calls use_html_editor() (more to come)

diff --git a/admin/maintenance.php b/admin/maintenance.php
index dc6729e890518b2d8e230c8bd22b899d04885f50..1364ba47526ca3b55aec1a857b0fa7f3a0c46a4b 100644 (file)
--- a/admin/maintenance.php
+++ b/admin/maintenance.php
@@ -59,10 +59,6 @@
         echo '</div>';
         echo '</form>';
         echo '</div>';
-
-        if ($usehtmleditor) { 
-            use_html_editor();
-        }
     }
 
     admin_externalpage_print_footer();

diff --git a/admin/roles/manage.php b/admin/roles/manage.php
index 11c0e2a09cfeff91874706fa798ffa1e28e3ffe8..1ed02410acdf67535aa3099bab6cc7676774835b 100755 (executable)
--- a/admin/roles/manage.php
+++ b/admin/roles/manage.php
@@ -500,10 +500,6 @@
         include_once('manage.html');
         print_simple_box_end();
 
-        if ($usehtmleditor) {
-            use_html_editor('description');
-        }
-
     } else {
 
         print_heading_with_help(get_string('roles', 'role'), 'roles');

diff --git a/admin/settings.php b/admin/settings.php
index 1ee435828488e8813a4b2665e778b65ef85389b8..0edb1120cdffd7b99a05f6f8e5d65e2d134f8361 100644 (file)
--- a/admin/settings.php
+++ b/admin/settings.php
@@ -163,10 +163,6 @@ if (empty($SITE->fullname)) {
     echo '</tr></table>';
 }
 
-if (!empty($CFG->adminusehtmleditor)) {
-    use_html_editor();
-}
-
 print_footer();
 
 ?>

diff --git a/admin/upgradesettings.php b/admin/upgradesettings.php
index 2f23407626596a6e4819a31a7e2bd63677bf09d8..d5973418d180e59d21db317cef7ed646aade8e01 100644 (file)
--- a/admin/upgradesettings.php
+++ b/admin/upgradesettings.php
@@ -63,10 +63,6 @@ echo '<div class="form-buttons"><input class="form-submit" type="submit" value="
 echo '</div>';
 echo '</form>';
 
-if (!empty($CFG->adminusehtmleditor)) {
-    use_html_editor();
-}
-
 print_footer();
 
 ?>

diff --git a/blocks/html/config_instance.html b/blocks/html/config_instance.html
index 8138488d02646602c616479225f7b0faca92e7f7..6352ee80e45f146541ed75c28ba012acafbc9acb 100755 (executable)
--- a/blocks/html/config_instance.html
+++ b/blocks/html/config_instance.html
@@ -13,7 +13,3 @@
     <input type="submit" value="<?php print_string('savechanges') ?>" /></td>
 </tr>
 </table>
-<?php if ($usehtmleditor) {
-          use_html_editor(); 
-      }
-?>

diff --git a/calendar/event.php b/calendar/event.php
index 05bdef9ce9b9c98c6c6cb89477e1491d768a392f..a8a4bd2ca75dac691a5c1f6f2aa5bd76f7e24563 100644 (file)
--- a/calendar/event.php
+++ b/calendar/event.php
@@ -519,9 +519,6 @@
             }
             else {
                 include('event_new.html');
-                if ($usehtmleditor) {
-                    use_html_editor("description");
-                }
             }
 
         break;

diff --git a/lib/questionlib.php b/lib/questionlib.php
index 35d1a30cfcec0304fc75ca8753ff04569320e2a6..e304dbb77f5ab0ab855f677d8da5a083d0774d0e 100644 (file)
--- a/lib/questionlib.php
+++ b/lib/questionlib.php
@@ -1674,10 +1674,6 @@ function question_print_comment_box($question, $state, $attempt, $url) {
    echo '<input type="hidden" name="sesskey" value="'.sesskey().'" />';
    echo '<input type="submit" name="submit" value="'.get_string('save', 'quiz').'" />';
    echo '</form>';
-
-   if ($usehtmleditor) {
-       use_html_editor();
-   }
 }
 
 /**