small code cleanup (merge)

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 798e9b5bef76a0f70cfda6ece7b515dba529dd53..b41746db2cec8658158dac855b5f0445615cfa48 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -6137,20 +6137,20 @@ function ini_get_bool($ini_get_arg) {
  * Determines if the HTML editor is enabled.
  * @deprecated Use {@link can_use_html_editor()} instead.
  */
- function can_use_richtext_editor() {
+function can_use_richtext_editor() {
     return can_use_html_editor();
 }
 
 /**
  * Determines if the HTML editor is enabled.
  *
- * This depends on site and user
- * settings, as well as the current browser being used.
+ * This depends on site and user settings, as well as the current browser being 
+ * used.  The current requirements are based on Tinymce's, which are available
+ * on http://wiki.moxiecode.com/index.php/TinyMCE:Compatiblity
  *
- * @return string|false Returns false if editor is not being used, otherwise
- * returns 'MSIE' or 'Gecko'.
+ * @return bool true if html editor can be used, false otherwise
  */
- function can_use_html_editor() {
+function can_use_html_editor() {
     global $USER, $CFG;
 
     if (!empty($USER->htmleditor) and !empty($CFG->htmleditor)) {
@@ -6181,7 +6181,7 @@ function check_gd_version() {
 
     } else {
         ob_start();
-        phpinfo(8);
+        phpinfo(INFO_MODULES);
         $phpinfo = ob_get_contents();
         ob_end_clean();