more globals fixed

diff --git a/mod/lesson/lib.php b/mod/lesson/lib.php
index c4540e0..9e84d55 100644 (file)
--- a/mod/lesson/lib.php
+++ b/mod/lesson/lib.php
@@ -155,12 +155,12 @@ function lesson_delete_course($course, $feedback=true) {
  * @return object
  */
 function lesson_user_outline($course, $user, $mod, $lesson) {
-    global $DB;
-
     global $CFG;
+
     require_once("$CFG->libdir/gradelib.php");
     $grades = grade_get_grades($course->id, 'mod', 'lesson', $lesson->id, $user->id);
 
+    $return = new object();
     if (empty($grades->items[0]->grades)) {
         $return->info = get_string("no")." ".get_string("attempts", "lesson");
     } else {

diff --git a/mod/lesson/pagetypes/endofcluster.php b/mod/lesson/pagetypes/endofcluster.php
index 83421d0..0518e61 100644 (file)
--- a/mod/lesson/pagetypes/endofcluster.php
+++ b/mod/lesson/pagetypes/endofcluster.php
@@ -106,6 +106,7 @@ class lesson_page_type_endofcluster extends lesson_page {
         return true;
     }
     public function override_next_page() {
+        global $DB;
         $jump = $DB->get_field("lesson_answers", "jumpto", array("pageid" => $this->properties->id, "lessonid" => $this->lesson->id));
         if ($jump == LESSON_NEXTPAGE) {
             if ($this->properties->nextpageid == 0) {

diff --git a/mod/lesson/pagetypes/matching.php b/mod/lesson/pagetypes/matching.php
index 6a66ad7..c5c7f6d 100644 (file)
--- a/mod/lesson/pagetypes/matching.php
+++ b/mod/lesson/pagetypes/matching.php
@@ -132,7 +132,7 @@ class lesson_page_type_matching extends lesson_page {
     }
 
     public function check_answer() {
-        global $CFG;
+        global $CFG, $PAGE;
 
         $formattextdefoptions = new object();
         $formattextdefoptions->noclean = true;

diff --git a/mod/lesson/pagetypes/multichoice.php b/mod/lesson/pagetypes/multichoice.php
index 0b9de02..28e1414 100644 (file)
--- a/mod/lesson/pagetypes/multichoice.php
+++ b/mod/lesson/pagetypes/multichoice.php
@@ -99,7 +99,7 @@ class lesson_page_type_multichoice extends lesson_page {
     }
 
     public function check_answer() {
-        global $DB, $CFG;
+        global $DB, $CFG, $PAGE;
         $result = parent::check_answer();
 
         $formattextdefoptions = new object();