From: Sam Hemelryk <sam@moodle.com>
Date: Mon, 31 Jan 2011 09:16:56 +0000 (+0800)
Subject: Merge branch 'm20_MDL-26176_cleanup' of github.com:danmarsden/moodle
X-Git-Tag: v2.0.2~139
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=1f5a33439eb7d0aef2e1cfe75d2512fa7a430a95

Merge branch 'm20_MDL-26176_cleanup' of github.com:danmarsden/moodle
---

1f5a33439eb7d0aef2e1cfe75d2512fa7a430a95
diff --cc mod/scorm/datamodels/scorm_12lib.php
index a2bb0323e19,a0a03c09f69..b8ac6f2c9ae
--- a/mod/scorm/datamodels/scorm_12lib.php
+++ b/mod/scorm/datamodels/scorm_12lib.php
@@@ -371,6 -346,4 +346,4 @@@ function scorm_get_toc($user,$scorm,$to
      $result->tocmenu = $OUTPUT->single_select($url, 'scoid', $tocmenus, $sco->id, null, "tocmenu");
  
      return $result;
 -}
 +}
- 
- 
diff --cc mod/scorm/datamodels/scorm_13lib.php
index cff809de841,874123ab8ab..496d541ea53
--- a/mod/scorm/datamodels/scorm_13lib.php
+++ b/mod/scorm/datamodels/scorm_13lib.php
@@@ -260,6 -238,4 +238,4 @@@ function scorm_get_toc($user,$scorm,$to
      $result->tocmenu = $OUTPUT->single_select($url, 'scoid', $tocmenus, $sco->id, null, "tocmenu");
  
      return $result;
 -}
 +}
- 
-