course completion: MDL-2631 Fix rare mark_completed bug

[moodle.git] / lib / completion / completion_completion.php

diff --git a/lib/completion/completion_completion.php b/lib/completion/completion_completion.php
index 82903a9..6737789 100644 (file)
--- a/lib/completion/completion_completion.php
+++ b/lib/completion/completion_completion.php
@@ -138,9 +138,9 @@ class completion_completion extends data_object {
      */
     public function mark_enrolled($timeenrolled = null) {
 
      */
     public function mark_enrolled($timeenrolled = null) {
 

-        if (!$this->timeenrolled) {
+        if ($this->timeenrolled === null) {

 
 

-            if (!$timeenrolled) {
+            if ($timeenrolled === null) {

                 $timeenrolled = time();
             }
 
                 $timeenrolled = time();
             }
 


@@ -219,15 +219,8 @@ class completion_completion extends data_object {
 
         global $DB;
 
 
         global $DB;
 

-        if (!$this->timeenrolled) {
-            // Get users timenrolled
-            // Can't find a more efficient way of doing this without alter get_users_by_capability()
-            $context = get_context_instance(CONTEXT_COURSE, $this->course);
-            if ($roleassignment = $DB->get_record('role_assignments', array('contextid' => $context->id, 'userid' => $this->userid))) {
-                $this->timeenrolled = $roleassignment->timestart;
-            } else {
-                $this->timeenrolled = 0;
-            }
+        if ($this->timeenrolled === null) {
+            $this->timeenrolled = 0;

         }
 
         // Save record
         }
 
         // Save record


@@ -239,6 +232,11 @@ class completion_completion extends data_object {
                 $this->reaggregate = 0;
             }
 
                 $this->reaggregate = 0;
             }
 

+                       // Make sure timestarted is not null
+                       if (!$this->timestarted) {
+                               $this->timestarted = 0;
+                       }
+                       

             $this->insert();
         }
     }
             $this->insert();
         }
     }