Merged from STABLE

diff --git a/course/edit.php b/course/edit.php
index 719efc55046d15a08b4fa4c0c888133609519a4c..6758a8943c9726473595604473b83c767ad0bd1f 100644 (file)
--- a/course/edit.php
+++ b/course/edit.php
@@ -5,8 +5,8 @@
     require_once("lib.php");
     require_once("$CFG->libdir/blocklib.php");
 
-    optional_variable($id, 0);   // course id
-    optional_variable($category, 0);   // category id
+    $id       = (int)parameter('id', 0);         // course id
+    $category = (int)parameter('category', 0);   // possible default category
 
     require_login();
 

diff --git a/course/mod.php b/course/mod.php
index 0fd037930dda1bd1f8a6d36b2722607065054d73..8e9b7e8a5d504889cc3cdd6dd2130c583e95adb4 100644 (file)
--- a/course/mod.php
+++ b/course/mod.php
@@ -35,7 +35,9 @@
             error("You can't modify this course!");
         }
 
+        $mod->modulename = clean_filename($mod->modulename);  // For safety
         $modlib = "$CFG->dirroot/mod/$mod->modulename/lib.php";
+
         if (file_exists($modlib)) {
             include_once($modlib);
         } else {