BRANCH MERGE

These are the changes from MOODLE_13_STABLE, merged into trunk

The tag MOODLE_13_MERGED on the MOODLE_13_STABLE branch now refers to this point

The biggest changes here are the fixes for HTML editor in all standard modules
This commit is contained in:
moodler 2004-06-04 06:17:30 +00:00
parent 308214e87e
commit 7613890851
49 changed files with 175 additions and 198 deletions

View file

@ -184,7 +184,7 @@
print_footer($course);
if ($usehtmleditor) {
use_html_editor();
use_html_editor("summary");
}
exit;

View file

@ -58,7 +58,7 @@
print_simple_box_end();
if ($usehtmleditor) {
use_html_editor();
use_html_editor("summary");
}
print_footer($course);

View file

@ -95,7 +95,7 @@
include('group-edit.html');
if ($usehtmleditor) {
use_html_editor();
use_html_editor("description");
}
print_footer();

View file

@ -622,6 +622,12 @@
if (file_exists($modform)) {
if ($usehtmleditor = can_use_html_editor()) {
$defaultformat = FORMAT_HTML;
} else {
$defaultformat = FORMAT_MOODLE;
}
$icon = "<img align=absmiddle height=16 width=16 src=\"$CFG->modpixpath/$module->name/icon.gif\">&nbsp;";
print_heading_with_help($pageheading, "mods", $module->name, $icon);
@ -629,6 +635,10 @@
include_once($modform);
print_simple_box_end();
if ($usehtmleditor and empty($nohtmleditorneeded)) {
use_html_editor();
}
} else {
notice("This module cannot be added to this course yet! (No file found at: $modform)", "$CFG->wwwroot/course/view.php?id=$course->id");
}