Permalink
Browse files

MDL-12614 - Bad regular expression matching was causing syntactically

invalid js when returning to previously attempted SCORM package.

merged from MOODLE_19_STABLE
  • Loading branch information...
1 parent 094a70b commit aa2b1ba10d55c137d2a9f3abf9ea8871bc729ea4 poltawski committed Apr 30, 2008
Showing with 6 additions and 6 deletions.
  1. +3 −3 mod/scorm/datamodels/scorm_12.js.php
  2. +3 −3 mod/scorm/datamodels/scorm_13.js.php
@@ -133,9 +133,9 @@ function SCORMapi1_2() {
$objectives = '';
foreach($userdata as $element => $value){
if (substr($element,0,14) == 'cmi.objectives') {
- preg_match('/\.(\d+)\./',$element,$matches);
- $element = preg_replace('/\.(\d+)\./',".\$1.",$element);
- if ($matches[1] == $count) {
+ $element = preg_replace('/\.(\d+)\./', "_\$1.", $element);
+ preg_match('/_(\d+)\./', $element, $matches);
+ if (isset($matches[1]) && $matches[1] == $count) {
$count++;
$end = strpos($element,$matches[1])+strlen($matches[1]);
$subelement = substr($element,0,$end);
@@ -166,9 +166,9 @@ function SCORMapi1_3() {
$objectives = '';
foreach($userdata as $element => $value){
if (substr($element,0,14) == 'cmi.objectives') {
- preg_match('/\.(\d+)\./',$element,$matches);
- $element = preg_replace('/\.(\d+)\./',".N\$1.",$element);
- if ($matches[1] == $count) {
+ $element = preg_replace('/\.(\d+)\./', "_\$1.", $element);
+ preg_match('/_(\d+)\./', $element, $matches);
+ if (isset($matches[1]) && $matches[1] == $count) {
$count++;
$end = strpos($element,$matches[1])+strlen($matches[1]);
$subelement = substr($element,0,$end);

0 comments on commit aa2b1ba

Please sign in to comment.