Merging from stable branch

This commit is contained in:
gustav_delius 2004-08-24 18:38:14 +00:00
parent b9aa323f14
commit 8f6b80b90c
13 changed files with 16 additions and 12 deletions

View File

@ -6,7 +6,7 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
$module->version = 2004060400; $module->version = 2004060400;
$module->requires = 2004052501; // Requires this Moodle version $module->requires = 2004052505; // Requires this Moodle version
$module->cron = 60; $module->cron = 60;
?> ?>

View File

@ -6,7 +6,7 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
$module->version = 2004060400; // The current module version (Date: YYYYMMDDXX) $module->version = 2004060400; // The current module version (Date: YYYYMMDDXX)
$module->requires = 2004052501; // Requires this Moodle version $module->requires = 2004052505; // Requires this Moodle version
$module->cron = 3600; // Period for cron to check this module (secs) $module->cron = 3600; // Period for cron to check this module (secs)
?> ?>

View File

@ -6,7 +6,7 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
$module->version = 2004060400; // The (date) version of this module $module->version = 2004060400; // The (date) version of this module
$module->requires = 2004052501; // Requires this Moodle version $module->requires = 2004052505; // Requires this Moodle version
$module->cron = 300; // How often should cron check this module (seconds)? $module->cron = 300; // How often should cron check this module (seconds)?
?> ?>

View File

@ -6,7 +6,7 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
$module->version = 2004070102; $module->version = 2004070102;
$module->requires = 2004052501; // Requires this Moodle version $module->requires = 2004052505; // Requires this Moodle version
$module->cron = 0; $module->cron = 0;
?> ?>

View File

@ -6,7 +6,7 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
$module->version = 2004060400; $module->version = 2004060400;
$module->requires = 2004052501; // Requires this Moodle version $module->requires = 2004052505; // Requires this Moodle version
$module->cron = 60; $module->cron = 60;
?> ?>

View File

@ -6,7 +6,7 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
$module->version = 2004062300; $module->version = 2004062300;
$module->requires = 2004052501; // Requires this Moodle version $module->requires = 2004052505; // Requires this Moodle version
$module->cron = 60; $module->cron = 60;
?> ?>

View File

@ -6,7 +6,7 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
$module->version = 2004060400; $module->version = 2004060400;
$module->requires = 2004052501; // Requires this Moodle version $module->requires = 2004052505; // Requires this Moodle version
$module->cron = 60; $module->cron = 60;
?> ?>

View File

@ -6,7 +6,7 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
$module->version = 2004060400; // The current module version (Date: YYYYMMDDXX) $module->version = 2004060400; // The current module version (Date: YYYYMMDDXX)
$module->requires = 2004052501; // Requires this Moodle version $module->requires = 2004052505; // Requires this Moodle version
$module->cron = 0; // Period for cron to check this module (secs) $module->cron = 0; // Period for cron to check this module (secs)
?> ?>

View File

@ -6,7 +6,7 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
$module->version = 2004060400; // The current module version (Date: YYYYMMDDXX) $module->version = 2004060400; // The current module version (Date: YYYYMMDDXX)
$module->requires = 2004052501; // Requires this Moodle version $module->requires = 2004052505; // Requires this Moodle version
$module->cron = 0; // Period for cron to check this module (secs) $module->cron = 0; // Period for cron to check this module (secs)
?> ?>

View File

@ -6,7 +6,7 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
$module->version = 2004071900; // The (date) version of this module $module->version = 2004071900; // The (date) version of this module
$module->requires = 2004051600; // The version of Moodle that is required $module->requires = 2004052505; // The version of Moodle that is required
$module->cron = 0; // How often should cron check this module (seconds)? $module->cron = 0; // How often should cron check this module (seconds)?
?> ?>

View File

@ -6,7 +6,7 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
$module->version = 2004060400; $module->version = 2004060400;
$module->requires = 2004051600; // Requires this Moodle version $module->requires = 2004052505; // Requires this Moodle version
$module->cron = 0; $module->cron = 0;
?> ?>

View File

@ -731,7 +731,11 @@ function ewiki_page_view($id, &$data, $action, $all=1) {
return($o); return($o);
} }
#### MOODLE CHANGE #### MOODLE CHANGE
/// Add Moodle filters to text porion of wiki.
global $moodle_format; // from wiki/view.php
$o = format_text($o, $moodle_format);
$o.= "<br><br>"; $o.= "<br><br>";
#-- control line + other per-page info stuff #-- control line + other per-page info stuff
if ($pf_a = $ewiki_plugins["view_append"]) { if ($pf_a = $ewiki_plugins["view_append"]) {
ksort($pf_a); ksort($pf_a);

View File

@ -6,7 +6,7 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
$module->version = 2004060400; $module->version = 2004060400;
$module->requires = 2004051600; // Requires this Moodle version $module->requires = 2004052505; // Requires this Moodle version
$module->cron = 60; $module->cron = 60;
?> ?>