mirror of
https://github.com/moodle/moodle.git
synced 2025-08-05 08:56:36 +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
|
@ -451,7 +451,7 @@
|
|||
</form>
|
||||
<?php
|
||||
if ($usehtmleditor and $form->type == HTML) {
|
||||
use_html_editor();
|
||||
use_html_editor("alltext");
|
||||
}
|
||||
print_simple_box_end();
|
||||
print_footer($course);
|
||||
|
|
|
@ -14,6 +14,7 @@
|
|||
if (empty($form->alltext)) {
|
||||
$form->alltext = "";
|
||||
}
|
||||
$nohtmleditorneeded = true;
|
||||
?>
|
||||
|
||||
|
||||
|
@ -54,7 +55,7 @@
|
|||
</font>
|
||||
</td>
|
||||
<td>
|
||||
<textarea name="summary" rows=5 cols=50 wrap="virtual"><?php p($form->summary) ?></textarea>
|
||||
<?php print_textarea(false, 7, 50, 680, 400, "summary", $form->summary); ?>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
$module->version = 2004013101;
|
||||
$module->requires = 2004051600; // Requires this Moodle version
|
||||
$module->requires = 2004052501; // Requires this Moodle version
|
||||
$module->cron = 0;
|
||||
|
||||
?>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue