diff --git a/mod/scorm/datamodels/scorm_12.js.php b/mod/scorm/datamodels/scorm_12.js.php index a15f22241e0..9bab6e53960 100644 --- a/mod/scorm/datamodels/scorm_12.js.php +++ b/mod/scorm/datamodels/scorm_12.js.php @@ -540,7 +540,7 @@ function SCORMapi1_2() { if (eval('datamodel["'+elementmodel+'"].mod') != 'r') { elementstring = '&'+underscore(element)+'='+encodeURIComponent(data[property]); if ((typeof eval('datamodel["'+elementmodel+'"].defaultvalue')) != "undefined") { - if (eval('datamodel["'+elementmodel+'"].defaultvalue') != data[property]) { + if (eval('datamodel["'+elementmodel+'"].defaultvalue') != data[property] || eval('typeof(datamodel["'+elementmodel+'"].defaultvalue)') != typeof(data[property])) { datastring += elementstring; } } else { diff --git a/mod/scorm/datamodels/scorm_13.js.php b/mod/scorm/datamodels/scorm_13.js.php index 0a6246e8318..f5cb17c2caf 100644 --- a/mod/scorm/datamodels/scorm_13.js.php +++ b/mod/scorm/datamodels/scorm_13.js.php @@ -57,7 +57,7 @@ function SCORMapi1_3() { 'tam':'tam', 'tel':'tel', 'tgk':'tgk', 'tha':'tha', 'tir':'tir', 'tuk':'tuk', 'tgl':'tgl', 'tsn':'tsn', 'ton':'ton', 'tur':'tur', 'tso':'tso', 'tat':'tat', 'twi':'twi', 'tah':'tah', 'uig':'uig', 'ukr':'ukr', 'urd':'urd', 'uzb':'uzb', 'ven':'ven', 'vie':'vie', 'vol':'vol', 'wln':'wln', 'wol':'wol', 'xho':'xho', 'yid':'yid', 'yor':'yor', 'zha':'zha', 'chi':'chi', 'zho':'zho', 'zul':'zul'}; - var CMIString200 = '^[\\u0000-\\uFFFF]{0,200}$$'; + var CMIString200 = '^[\\u0000-\\uFFFF]{0,200}$'; var CMIString250 = '^[\\u0000-\\uFFFF]{0,250}$'; var CMIString1000 = '^[\\u0000-\\uFFFF]{0,1000}$'; var CMIString4000 = '^[\\u0000-\\uFFFF]{0,4000}$'; @@ -1189,7 +1189,7 @@ function SCORMapi1_3() { if (eval('datamodel["'+elementmodel+'"].mod') != 'r') { var elementstring = '&'+underscore(element)+'='+encodeURIComponent(data[property]); if ((typeof eval('datamodel["'+elementmodel+'"].defaultvalue')) != "undefined") { - if (eval('datamodel["'+elementmodel+'"].defaultvalue') != data[property]) { + if (eval('datamodel["'+elementmodel+'"].defaultvalue') != data[property] || eval('typeof(datamodel["'+elementmodel+'"].defaultvalue)') != typeof(data[property])) { datastring += elementstring; } } else {