1
0
mirror of https://github.com/moodle/moodle.git synced 2025-04-24 09:55:33 +02:00

Merge branch 'master_MDL-51015' of git://github.com/danmarsden/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2015-08-11 14:09:42 +02:00
commit 99c582a19f

@ -1303,7 +1303,7 @@ function scorm_get_attempt_count($userid, $scorm, $returnobjects = false, $ignor
* @return boolean - debugging true/false
*/
function scorm_debugging($scorm) {
global $CFG, $USER;
global $USER;
$cfgscorm = get_config('scorm');
if (!$cfgscorm->allowapidebug) {
@ -1315,9 +1315,11 @@ function scorm_debugging($scorm) {
if (!preg_match('/^[\w\s\*\.\?\+\:\_\\\]+$/', $test)) {
return false;
}
$res = false;
eval('$res = preg_match(\'/^'.$test.'/\', $identifier) ? true : false;');
return $res;
if (preg_match('/^'.$test.'/', $identifier)) {
return true;
}
return false;
}
/**