Permalink
Browse files

MDL-35418 SCORM: remove dumb function, include sequencinglib.php as s…

…corm_13lib.php still calls some of the functions.
  • Loading branch information...
1 parent 92be6fa commit 995e322e753f6e8acc04b96e2238a3a1bf174f19 @danmarsden danmarsden committed Sep 13, 2012
Showing with 4 additions and 6 deletions.
  1. +3 −0 mod/scorm/datamodels/scorm_13lib.php
  2. +0 −4 mod/scorm/datamodels/sequencinglib.php
  3. +1 −2 mod/scorm/locallib.php
@@ -14,7 +14,10 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
+defined('MOODLE_INTERNAL') || die();
+
require_once($CFG->dirroot.'/mod/scorm/datamodels/scormlib.php');
+require_once($CFG->dirroot.'/mod/scorm/datamodels/sequencinglib.php');
function scorm_seq_overall ($scoid, $userid, $request, $attempt) {
$seq = scorm_seq_navigation($scoid, $userid, $request, $attempt);
@@ -14,10 +14,6 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
-function scorm_seq_evaluate($scoid,$usertracks) {
- return true;
-}
-
function scorm_seq_exit_action_rules($seq,$userid) {
$sco = $seq->currentactivity;
$ancestors = scorm_get_ancestors($sco);
@@ -1418,8 +1418,7 @@ function scorm_get_toc_object($user, $scorm, $currentorg='', $scoid='', $mode='n
}
if (scorm_version_check($scorm->version, SCORM_13)) {
- require_once($CFG->dirroot.'/mod/scorm/datamodels/sequencinglib.php');
- $sco->prereq = scorm_seq_evaluate($sco->id, $usertracks);
+ $sco->prereq = true;
} else {
$sco->prereq = empty($sco->prerequisites) || scorm_eval_prerequisites($sco->prerequisites, $usertracks);
}

0 comments on commit 995e322

Please sign in to comment.