Merge branch 'm28_MDL-51015' of git://github.com/danmarsden/moodle into MOODLE_28_STABLE

2015-08-11 14:09:59 +02:00
parent b9bdaf698c a3ca598f14
commit 6e6fba961c
1 changed files with 6 additions and 4 deletions
@@ -1302,7 +1302,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) {
@@ -1314,9 +1314,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;
 }

 /**