MDL-11113: simplify the code - use only one function to check for html editor availab...

diff --git a/calendar/event.php b/calendar/event.php
index 457493cb55035df308313d33f5ff59c5257a2504..8ca1eb0b88acc679ec95e8c4c1e226d79c2b74f1 100644 (file)
--- a/calendar/event.php
+++ b/calendar/event.php
@@ -80,7 +80,7 @@
     $mon = intval($now['mon']);
     $yr = intval($now['year']);
 
-    if ($usehtmleditor = can_use_richtext_editor()) {
+    if ($usehtmleditor = can_use_html_editor()) {
         $defaultformat = FORMAT_HTML;
     } else {
         $defaultformat = FORMAT_MOODLE;

diff --git a/lang/en_utf8/help/richtext.html b/lang/en_utf8/help/richtext.html
index c7ef61ed98c7a9a4a16610f1471512a0a7a239d2..7ac3c643825fc74c6abc3939dd48595380e6c54e 100644 (file)
--- a/lang/en_utf8/help/richtext.html
+++ b/lang/en_utf8/help/richtext.html
@@ -5,7 +5,7 @@
        print_string("htmleditordisabledadmin");
    } else if (!$USER->htmleditor) {
        print_string("htmleditordisabled");
-   } else if (!can_use_richtext_editor()) {
+   } else if (!can_use_html_editor()) {
        print_string("htmleditordisabledbrowser");
    } else {
        print_string("htmleditoravailable");

diff --git a/lang/en_utf8/help/richtext2.html b/lang/en_utf8/help/richtext2.html
index dc240a64a9c26b136e993b2e895c2101e382590f..3711183d6f16010aa926825dee02fa52d9628365 100644 (file)
--- a/lang/en_utf8/help/richtext2.html
+++ b/lang/en_utf8/help/richtext2.html
@@ -5,7 +5,7 @@
        print_string("htmleditordisabledadmin");
    } else if (!$USER->htmleditor) {
        print_string("htmleditordisabled");
-   } else if (!can_use_richtext_editor()) {
+   } else if (!can_use_html_editor()) {
        print_string("htmleditordisabledbrowser");
    } else {
        print_string("htmleditoravailable");

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index c48ccb0e4a09cf591a19d2ee805072a80ce619ed..c40e4d2397fd97641993dbeccf6461358a4b9a6b 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -6144,16 +6144,6 @@ function ini_get_bool($ini_get_arg) {
     return false;
 }
 
-/**
- * Compatibility stub to provide backward compatibility
- *
- * Determines if the HTML editor is enabled.
- * @deprecated Use {@link can_use_html_editor()} instead.
- */
-function can_use_richtext_editor() {
-    return can_use_html_editor();
-}
-
 /**
  * Determines if the HTML editor is enabled.
  *

diff --git a/lib/questionlib.php b/lib/questionlib.php
index 64da4dac8d909b76ada9d8fbd442e5f70fead1ed..94259e5b97a1f378805fa9de27cb673127d2c718 100644 (file)
--- a/lib/questionlib.php
+++ b/lib/questionlib.php
@@ -1373,7 +1373,7 @@ function question_print_comment_box($question, $state, $attempt, $url) {
    global $CFG;
 
    $prefix = 'response';
-   $usehtmleditor = can_use_richtext_editor();
+   $usehtmleditor = can_use_html_editor();
    $grade = round($state->last_graded->grade, 3);
    echo '<form method="post" action="'.$url.'">';
    include($CFG->dirroot.'/question/comment.html');

diff --git a/mod/data/field/textarea/field.class.php b/mod/data/field/textarea/field.class.php
index ebf6360f6f246a3cafa16e7c2148bd526edcd9ea..10032ea19aa2897b219b25ebd556f49309056015 100755 (executable)
--- a/mod/data/field/textarea/field.class.php
+++ b/mod/data/field/textarea/field.class.php
@@ -46,7 +46,7 @@ class data_field_textarea extends data_field_base {
 
         $str = '<div title="'.$this->field->description.'">';
 
-        if (can_use_richtext_editor()) {
+        if (can_use_html_editor()) {
             // Show a rich text html editor.
             $str .= $this->gen_textarea(true, $text);
             $str .= helpbutton("richtext2", get_string("helprichtext"), 'moodle', true, true, '', true);
@@ -89,7 +89,7 @@ class data_field_textarea extends data_field_base {
 
 
     function print_after_form() {
-        if (can_use_richtext_editor()) {
+        if (can_use_html_editor()) {
             use_html_editor('field_' . $this->field->id, '', 'field_' . $this->field->id);
         }
     }

diff --git a/mod/quiz/report/grading/report.php b/mod/quiz/report/grading/report.php
index af40baf85e7953cd0973763931e2546a2cd786a3..93f58faaeb5de00a8ee9aa63df49c624b6ce29c7 100644 (file)
--- a/mod/quiz/report/grading/report.php
+++ b/mod/quiz/report/grading/report.php
@@ -335,7 +335,7 @@ class quiz_report extends quiz_default_report {
         $context = NULL;
 
         $questions[$question->id] = &$question;
-        $usehtmleditor = can_use_richtext_editor();
+        $usehtmleditor = can_use_html_editor();
         $users     = get_course_students($quiz->course);
         $userids   = implode(',', array_keys($users));
 

diff --git a/user/messageselect.php b/user/messageselect.php
index 3ab50d83fbb87427fbfe2fe81298fb02b0b6988f..e023a4304eb5967ad647747c5bcef8a7cd25b3ea 100644 (file)
--- a/user/messageselect.php
+++ b/user/messageselect.php
@@ -130,7 +130,7 @@
     }
 
     if (count($SESSION->emailto[$id])) {
-        $usehtmleditor = can_use_richtext_editor();
+        $usehtmleditor = can_use_html_editor();
         require("message.html");
         if ($usehtmleditor) {
             use_html_editor("messagebody");