From 119fff55dd5c2f3b47ee81f357a3d141cd1b6d5d Mon Sep 17 00:00:00 2001
From: Dan Marsden <Dan@digitalclay.co.nz>
Date: Thu, 8 Jul 2010 09:48:12 +0000
Subject: [PATCH] SCORM MDL-22423 don't include empty raw scores from assets
 when calculating grade merged from HEAD

---
 mod/scorm/locallib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php
index fbde912716a..2c030a2e20f 100755
--- a/mod/scorm/locallib.php
+++ b/mod/scorm/locallib.php
@@ -451,7 +451,7 @@ function scorm_grade_user_attempt($scorm, $userid, $attempt=1, $time=false) {
             if (($userdata->status == 'completed') || ($userdata->status == 'passed')) {
                 $attemptscore->scoes++;
             }
-            if (isset($userdata->score_raw)) {
+            if (!empty($userdata->score_raw) || ($scorm->type=='sco' && isset($userdata->score_raw))) {
                 $attemptscore->values++;
                 $attemptscore->sum += $userdata->score_raw;
                 $attemptscore->max = ($userdata->score_raw > $attemptscore->max)?$userdata->score_raw:$attemptscore->max;