From 05d9f028e728afa04da9089bca2cc8cd7a5addaf Mon Sep 17 00:00:00 2001
From: Dan Marsden <Dan@digitalclay.co.nz>
Date: Fri, 12 Mar 2010 07:27:22 +0000
Subject: [PATCH] AICC MDL-21305 mastery score should be set even when
 lessonstatus <> "completed" - thanks to Matteo Scaramuccia for report and
 fix. merged from HEAD

---
 mod/scorm/aicc.php | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/mod/scorm/aicc.php b/mod/scorm/aicc.php
index 0605a7ba4ba..e379104060c 100755
--- a/mod/scorm/aicc.php
+++ b/mod/scorm/aicc.php
@@ -261,19 +261,18 @@
                                 $id = scorm_insert_track($USER->id, $scorm->id, $sco->id, $attempt, 'cmi.core.lesson_status', 'browsed');
                             }
                             if ($mode == 'normal') {
-                                if ($lessonstatus == 'completed') {
-									if ($sco = scorm_get_sco($scoid)) {
-                                        if (!empty($sco->mastery_score)) {
-                                            if (!empty($score)) {
-                                                if ($score >= $sco->mastery_score) {
-                                                    $lessonstatus = 'passed';
-                                                } else {
-                                                    $lessonstatus = 'failed';
-                                                }
+
+                                if ($sco = scorm_get_sco($scoid)) {
+                                    if (!empty($sco->mastery_score)) {
+                                        if (!empty($score)) {
+                                            if ($score >= $sco->mastery_score) {
+                                                $lessonstatus = 'passed';
+                                            } else {
+                                                $lessonstatus = 'failed';
                                             }
                                         }
-										$id = scorm_insert_track($USER->id, $scorm->id, $sco->id, $attempt, 'cmi.core.lesson_status', $lessonstatus);
-									}
+                                    }
+                                    $id = scorm_insert_track($USER->id, $scorm->id, $sco->id, $attempt, 'cmi.core.lesson_status', $lessonstatus);
                                 }
                             }
                         }
@@ -372,4 +371,4 @@
             echo "error=3\r\nerror_text=Invalid Session ID\r\n";
         }
     }
-?>
+?>
\ No newline at end of file