Merging from stable branch

diff --git a/mod/assignment/version.php b/mod/assignment/version.php
index a4c4a2b8bca8488e99b3b0927a1025a66a032038..fa67847064b5fc94d3f68864985bbb0a46d9c17c 100644 (file)
--- 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 a574183c509b31e11d390c848f16792047d09fca..c9038f4a6c3cc0f8e501140a1daad85fb873672a 100644 (file)
--- 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 e64d9584a73ec6516133ba3d2e65ea79b9dcd4d8..7a4579168e1409eb9ffea583848613740933fd32 100644 (file)
--- 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 f80f7b30cf3ced2786807cf3eeac0c02a6a373c5..2a4e52d335345356da41b55e8be147386d01e47a 100644 (file)
--- 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 a4c4a2b8bca8488e99b3b0927a1025a66a032038..fa67847064b5fc94d3f68864985bbb0a46d9c17c 100644 (file)
--- 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 f1aa3b12e7bae214fd6c251b4d1bbe9fa6650d93..c64fc16831a421ec5ab84992ddf1ef94ab4fea55 100644 (file)
--- 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 a4c4a2b8bca8488e99b3b0927a1025a66a032038..fa67847064b5fc94d3f68864985bbb0a46d9c17c 100644 (file)
--- 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 27ca6e9593f809f8509690d4c9a297499c03163d..b1386cf7af0a537db6bd294298be36715addfff5 100644 (file)
--- 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 a5601863e6341981305cdf183097acd368f1f21e..c284a84add3f6731c55a607cf13a4a53b10d45f0 100644 (file)
--- 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 2d4e9034ec3c54aa9b1e081c3ea0c3467e7e853d..f665e38b57a062597e627581aa4e93ddd569cf78 100755 (executable)
--- 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 f3ad30b6188cdc5587fa4f1a0c8a7983e9ad4faa..0ca9a4e10138a228ed0e69caf378658458c03183 100644 (file)
--- 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 073069beff7aed793dfdacfdca9794a6c55cdada..178604fb95ee93f5b6a00e5b420f4c8dd2bddc12 100644 (file)
--- 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.= "<br><br>";
+
    #-- 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 087b4bedf3ea7ec71fbe54022cfec6fadfd1eef1..fa67847064b5fc94d3f68864985bbb0a46d9c17c 100644 (file)
--- 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;
 
 ?>