MDL-15859 - [PATCH] Fixes for tests of '' on Oracle.$DB->sql_empty() changes.

diff --git a/mod/scorm/lib.php b/mod/scorm/lib.php
index e384de4e5c5c7368fa3cf49aebeb95f102f4a336..7bf6dee6e9b5f090fb63ac1358813205d57069aa 100755 (executable)
--- a/mod/scorm/lib.php
+++ b/mod/scorm/lib.php
@@ -512,7 +512,7 @@ function scorm_grade_item_update($scorm, $grades=NULL) {
     }
     
     if (($scorm->grademethod % 10) == 0) { // GRADESCOES
-        if ($maxgrade = $DB->count_records_select('scorm_scoes', 'scorm = ? AND launch <> ?', array($scorm->id, ''))) {
+        if ($maxgrade = $DB->count_records_select('scorm_scoes', 'scorm = ? AND launch <> ?', array($scorm->id, $DB->sql_empty()))) {
             $params['gradetype'] = GRADE_TYPE_VALUE;
             $params['grademax']  = $maxgrade;
             $params['grademin']  = 0;

diff --git a/mod/scorm/loadSCO.php b/mod/scorm/loadSCO.php
index 06c875b12d880e3b564ad2778d72a6e58ad075f0..8de4742a6946747f4f401c8ce98c87bdcba65ef9 100755 (executable)
--- a/mod/scorm/loadSCO.php
+++ b/mod/scorm/loadSCO.php
@@ -40,7 +40,7 @@
         if ($sco = scorm_get_sco($scoid)) {
             if ($sco->launch == '') {
                 // Search for the next launchable sco
-                if ($scoes = $DB->get_records_select('scorm_scoes',"scorm = ? AND launch <> ? AND id > ?",array($scorm->id, '', $sco->id), 'id ASC')) {
+                if ($scoes = $DB->get_records_select('scorm_scoes',"scorm = ? AND launch <> ? AND id > ?",array($scorm->id, $DB->sql_empty(), $sco->id), 'id ASC')) {
                     $sco = current($scoes);
                 }
             }
@@ -50,7 +50,7 @@
     // If no sco was found get the first of SCORM package
     //
     if (!isset($sco)) {
-        $scoes = $DB->get_records_select('scorm_scoes',"scorm = ? AND launch <> ?", array($scorm->id, ''),'id ASC');
+        $scoes = $DB->get_records_select('scorm_scoes',"scorm = ? AND launch <> ?", array($scorm->id, $DB->sql_empty()),'id ASC');
         $sco = current($scoes);
     }
 

diff --git a/mod/scorm/locallib.php b/mod/scorm/locallib.php
index 74e62a3ba6b0d80a6a218d061901801e219dc2df..035b670d9e938dcb385a2004e2b1851843bd5ac8 100755 (executable)
--- a/mod/scorm/locallib.php
+++ b/mod/scorm/locallib.php
@@ -623,7 +623,7 @@ function scorm_simple_play($scorm,$user) {
 
    $result = false;
   
-   $scoes = $DB->get_records_select('scorm_scoes', 'scorm = ? AND launch <> ?', array($scorm->id, ''));
+   $scoes = $DB->get_records_select('scorm_scoes', 'scorm = ? AND launch <> ?', array($scorm->id, $DB->sql_empty()));
    
    if ($scoes && (count($scoes) == 1)) {
        if ($scorm->skipview >= 1) {