From 8f6b80b90cb462fcfd1dac312de90080601f3712 Mon Sep 17 00:00:00 2001 From: gustav_delius Date: Tue, 24 Aug 2004 18:38:14 +0000 Subject: [PATCH] Merging from stable branch --- mod/assignment/version.php | 2 +- mod/attendance/version.php | 2 +- mod/chat/version.php | 2 +- mod/choice/version.php | 2 +- mod/dialogue/version.php | 2 +- mod/exercise/version.php | 2 +- mod/journal/version.php | 2 +- mod/label/version.php | 2 +- mod/lesson/version.php | 2 +- mod/scorm/version.php | 2 +- mod/survey/version.php | 2 +- mod/wiki/ewiki/ewiki.php | 4 ++++ mod/workshop/version.php | 2 +- 13 files changed, 16 insertions(+), 12 deletions(-) diff --git a/mod/assignment/version.php b/mod/assignment/version.php index a4c4a2b8bc..fa67847064 100644 --- a/mod/assignment/version.php +++ b/mod/assignment/version.php @@ -6,7 +6,7 @@ //////////////////////////////////////////////////////////////////////////////// $module->version = 2004060400; -$module->requires = 2004052501; // Requires this Moodle version +$module->requires = 2004052505; // Requires this Moodle version $module->cron = 60; ?> diff --git a/mod/attendance/version.php b/mod/attendance/version.php index a574183c50..c9038f4a6c 100644 --- a/mod/attendance/version.php +++ b/mod/attendance/version.php @@ -6,7 +6,7 @@ ///////////////////////////////////////////////////////////////////////////////// $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) ?> diff --git a/mod/chat/version.php b/mod/chat/version.php index e64d9584a7..7a4579168e 100644 --- a/mod/chat/version.php +++ b/mod/chat/version.php @@ -6,7 +6,7 @@ ///////////////////////////////////////////////////////////////////////////////// $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)? ?> diff --git a/mod/choice/version.php b/mod/choice/version.php index f80f7b30cf..2a4e52d335 100644 --- a/mod/choice/version.php +++ b/mod/choice/version.php @@ -6,7 +6,7 @@ //////////////////////////////////////////////////////////////////////////////// $module->version = 2004070102; -$module->requires = 2004052501; // Requires this Moodle version +$module->requires = 2004052505; // Requires this Moodle version $module->cron = 0; ?> diff --git a/mod/dialogue/version.php b/mod/dialogue/version.php index a4c4a2b8bc..fa67847064 100644 --- a/mod/dialogue/version.php +++ b/mod/dialogue/version.php @@ -6,7 +6,7 @@ //////////////////////////////////////////////////////////////////////////////// $module->version = 2004060400; -$module->requires = 2004052501; // Requires this Moodle version +$module->requires = 2004052505; // Requires this Moodle version $module->cron = 60; ?> diff --git a/mod/exercise/version.php b/mod/exercise/version.php index f1aa3b12e7..c64fc16831 100644 --- a/mod/exercise/version.php +++ b/mod/exercise/version.php @@ -6,7 +6,7 @@ //////////////////////////////////////////////////////////////////////////////// $module->version = 2004062300; -$module->requires = 2004052501; // Requires this Moodle version +$module->requires = 2004052505; // Requires this Moodle version $module->cron = 60; ?> diff --git a/mod/journal/version.php b/mod/journal/version.php index a4c4a2b8bc..fa67847064 100644 --- a/mod/journal/version.php +++ b/mod/journal/version.php @@ -6,7 +6,7 @@ //////////////////////////////////////////////////////////////////////////////// $module->version = 2004060400; -$module->requires = 2004052501; // Requires this Moodle version +$module->requires = 2004052505; // Requires this Moodle version $module->cron = 60; ?> diff --git a/mod/label/version.php b/mod/label/version.php index 27ca6e9593..b1386cf7af 100644 --- a/mod/label/version.php +++ b/mod/label/version.php @@ -6,7 +6,7 @@ ///////////////////////////////////////////////////////////////////////////////// $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) ?> diff --git a/mod/lesson/version.php b/mod/lesson/version.php index a5601863e6..c284a84add 100644 --- a/mod/lesson/version.php +++ b/mod/lesson/version.php @@ -6,7 +6,7 @@ ///////////////////////////////////////////////////////////////////////////////// $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) ?> diff --git a/mod/scorm/version.php b/mod/scorm/version.php index 2d4e9034ec..f665e38b57 100755 --- a/mod/scorm/version.php +++ b/mod/scorm/version.php @@ -6,7 +6,7 @@ ///////////////////////////////////////////////////////////////////////////////// $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)? ?> diff --git a/mod/survey/version.php b/mod/survey/version.php index f3ad30b618..0ca9a4e101 100644 --- a/mod/survey/version.php +++ b/mod/survey/version.php @@ -6,7 +6,7 @@ //////////////////////////////////////////////////////////////////////////////// $module->version = 2004060400; -$module->requires = 2004051600; // Requires this Moodle version +$module->requires = 2004052505; // Requires this Moodle version $module->cron = 0; ?> diff --git a/mod/wiki/ewiki/ewiki.php b/mod/wiki/ewiki/ewiki.php index 073069beff..178604fb95 100644 --- a/mod/wiki/ewiki/ewiki.php +++ b/mod/wiki/ewiki/ewiki.php @@ -731,7 +731,11 @@ function ewiki_page_view($id, &$data, $action, $all=1) { return($o); } #### MOODLE CHANGE + /// Add Moodle filters to text porion of wiki. + global $moodle_format; // from wiki/view.php + $o = format_text($o, $moodle_format); $o.= "

"; + #-- control line + other per-page info stuff if ($pf_a = $ewiki_plugins["view_append"]) { ksort($pf_a); diff --git a/mod/workshop/version.php b/mod/workshop/version.php index 087b4bedf3..fa67847064 100644 --- a/mod/workshop/version.php +++ b/mod/workshop/version.php @@ -6,7 +6,7 @@ //////////////////////////////////////////////////////////////////////////////// $module->version = 2004060400; -$module->requires = 2004051600; // Requires this Moodle version +$module->requires = 2004052505; // Requires this Moodle version $module->cron = 60; ?> -- 2.39.5