### Eclipse Workspace Patch 1.0
#P moodle17
Index: lib/accesslib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/accesslib.php,v
retrieving revision 1.166.2.22
diff -u -r1.166.2.22 accesslib.php
--- lib/accesslib.php	31 Oct 2006 20:22:52 -0000	1.166.2.22
+++ lib/accesslib.php	1 Nov 2006 22:45:28 -0000
@@ -231,17 +231,24 @@
 
     global $USER;
 
-/// If the current user is not logged in, then make sure they are
+/// If the current user is not logged in, then make sure they are if needed
 
     if (empty($userid) and empty($USER->capabilities)) {
         if ($context && ($context->contextlevel == CONTEXT_COURSE)) {
             require_login($context->instanceid);
         } else if ($context && ($context->contextlevel == CONTEXT_MODULE)) {
             if ($cm = get_record('course_modules','id',$context->instanceid)) {
-                require_login($cm->course, true, $cm);
+                if (!$course = get_record('course', 'id', $cm->course)) {
+                    error('Incorrect course.');
+                }
+                require_course_login($course, true, $cm);
             } else {
                 require_login();
             }
+        } else if ($context && ($context->contextlevel == CONTEXT_SYSTEM)) {
+            if (!empty($CFG->forcelogin)) {
+                require_login();
+            }
         } else {
             require_login();
         }