From e68cdceee34307ebf1dc81b931e3e3bcaa1d58ea Mon Sep 17 00:00:00 2001 From: Dan Marsden Date: Wed, 4 Jan 2017 15:43:46 +1300 Subject: [PATCH] MDL-49557 mod_scorm: optionally strip quotes. --- mod/scorm/datamodels/aicclib.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/mod/scorm/datamodels/aicclib.php b/mod/scorm/datamodels/aicclib.php index 354018c78f3..d06cd5ca498 100644 --- a/mod/scorm/datamodels/aicclib.php +++ b/mod/scorm/datamodels/aicclib.php @@ -251,8 +251,12 @@ function scorm_parse_aicc(&$scorm) { $regexp = scorm_forge_cols_regexp($columns->columns, '(.+),'); for ($i = 1; $i < count($rows); $i++) { if (preg_match($regexp, $rows[$i], $matches)) { - $elementid = substr(trim($matches[$columns->mastercol + 1]), 1, -1); - $prereq = substr(trim($matches[2 - $columns->mastercol]), 1, -1); + $elementid = trim($matches[$columns->mastercol + 1]); + $elementid = trim(trim($elementid, '"'), "'"); // Remove any quotes. + + $prereq = trim($matches[2 - $columns->mastercol]); + $prereq = trim(trim($prereq, '"'), "'"); // Remove any quotes. + $courses[$courseid]->elements[$elementid]->prerequisites = $prereq; } }