mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 00:46:50 +02:00
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:
parent
308214e87e
commit
7613890851
49 changed files with 175 additions and 198 deletions
|
@ -1,14 +1,6 @@
|
|||
<!-- This page defines the form to create or edit an instance of this module -->
|
||||
<!-- It is used from /course/mod.php. The whole instance is available as $form. -->
|
||||
|
||||
<?php
|
||||
if ($usehtmleditor = can_use_html_editor()) {
|
||||
$defaultformat = FORMAT_HTML;
|
||||
} else {
|
||||
$defaultformat = FORMAT_MOODLE;
|
||||
}
|
||||
?>
|
||||
|
||||
<form name="form" method="post" action="mod.php">
|
||||
<center>
|
||||
<table cellpadding=5>
|
||||
|
@ -46,9 +38,3 @@
|
|||
<input type="submit" value="<?php print_string("savechanges") ?>">
|
||||
</center>
|
||||
</form>
|
||||
|
||||
<?php
|
||||
if ($usehtmleditor) {
|
||||
use_html_editor();
|
||||
}
|
||||
?>
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
/////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
$module->version = 2004021900; // The current module version (Date: YYYYMMDDXX)
|
||||
$module->requires = 2004013101; // Requires this Moodle version
|
||||
$module->requires = 2004052501; // Requires this Moodle version
|
||||
$module->cron = 0; // Period for cron to check this module (secs)
|
||||
|
||||
?>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue