Merge branch 'm20_MDL-26176_cleanup' of github.com:danmarsden/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 31 Jan 2011 09:16:56 +0000 (17:16 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 31 Jan 2011 09:16:56 +0000 (17:16 +0800)
1  2 
mod/scorm/datamodels/scorm_12lib.php
mod/scorm/datamodels/scorm_13lib.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;
 -}
 +}
@@@ -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;
 -}
 +}