moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

BRANCH MERGE

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

2
mod/glossary/comment.php
View file

@ -178,7 +178,7 @@
include("comment.html");
if ($usehtmleditor) {
use_html_editor();
use_html_editor("text");
}
}
}

4
mod/glossary/mod.html
View file

@ -1,7 +1,5 @@
<?PHP // $Id$
global $CFG;
if (!isset($form->studentcanpost)) {
$form->studentcanpost = $CFG->glossary_studentspost;
}
@ -74,7 +72,7 @@ if (!isset($form->showspecial)) {
</font>
</td>
<td>
<textarea name="intro" rows=5 cols=50 wrap="virtual"><?php p($form->intro) ?></textarea>
<?php print_textarea($usehtmleditor, 20, 50, 680, 400, "intro", $form->intro); ?>
</td>
</tr>
<TR valign=top>

2
mod/glossary/version.php
View file

@ -6,7 +6,7 @@
/////////////////////////////////////////////////////////////////////////////////
$module->version = 2004051400; // The current module version (Date: YYYYMMDDXX)
$module->requires = 2004050300; // Requires this Moodle version
$module->requires = 2004052501; // Requires this Moodle version
$module->cron = 0; // Period for cron to check this module (secs)
$release = "0.5 development"; // User-friendly version number